- Updated to version 2012.9 (2012i)
Merge branch 'PHP-5.3' into PHP-5.4
Merge branch 'PHP-5.4'
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  This will be PHP 5.3.20
  fix NEWS
  Fixed bug #63447 (max_input_vars doesn't filter variables when mbstring.encoding_translation = On)
  News entry for png memleak fix
  News entry for png memleak fix
  These need to be volatile in order to prevent leaking after the longjmp in the error handler
  These need to be volatile in order to prevent leaking after the longjmp in the error handler
- Fixed bug #63451 (config.guess file does not have AIX 7 defined, shared objects are not created)
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  - Fixed bug #63451 (config.guess file does not have AIX 7 defined, shared objects are not created)
Merge branch 'PHP-5.4'

* PHP-5.4:
  - Fixed bug #63451 (config.guess file does not have AIX 7 defined, shared objects are not created)
- BFN
fix invalid read when trimming empty string
fix invalid read when trimming empty string
fix invalid read when trimming empty string
make failed tests fail the test target

I don't see any reason to ignore failed tests. This makes it
unnecessarily difficult to use ci, also for module builds.
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  make failed tests fail the test target
  fix invalid read when trimming empty string
  - Fixed bug #63451 (config.guess file does not have AIX 7 defined, shared objects are not created)
Update arginfo for preg_match_all() to reflect reality.

Back when I implemented FR #53238 during the 5.4 development phase to make the
$matches parameter optional in preg_match_all(), it turns out I forgot to
update the arginfo to note that only 2 parameters are now required by
preg_match_all(). The function itself works fine, but reflection was reporting
the wrong number of required parameters.
Merge branch 'preg_match_all_arginfo' into PHP-5.4

* preg_match_all_arginfo:
  Update arginfo for preg_match_all() to reflect reality.
Merge branch 'PHP-5.4'

* PHP-5.4:
  Update arginfo for preg_match_all() to reflect reality.
  fix invalid read when trimming empty string
List ext/intl changes also in NEWS
Corrected grammar/spelling of text in php.ini files

There are no actual code changes here; I corrected grammar and spelling
errors in the php.ini-production and php.ini-development files. I also
rewrote some sentences to make them less cumbersome.
Corrected spelling of 'shortcut'
Merge branch 'master' of git.php.net:/php-src