Viewing all changes in revision 442.
- Committer: Jeffrey Crowell
- Date: 2014-09-11 17:45:22 UTC
- mfrom: (389.2.13)
- Revision ID: git-v1:554577bbf266163a8dcd162e0726965b894545b1
Merge branch 'master' into HEAD
Preparing for 1.9.32.1 release
Conflicts:
config
src/ngx_pagespeed.cc
src/ngx_rewrite_driver_factory.h
src/ngx_rewrite_options.cc
test/nginx_system_test.sh
test/pagespeed_test.conf.template
Preparing for 1.9.32.1 release
Conflicts:
config
src/ngx_pagespeed.cc
src/ngx_rewrite_driver_factory.h
src/ngx_rewrite_options.cc
test/nginx_system_test.sh
test/pagespeed_test.conf.template
expand all
collapse all
added
removed
