- Updated to version 2012.9 (2012i)
Merge branch 'PHP-5.3' into PHP-5.4
- 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)
- BFN
fix invalid read when trimming empty string
fix invalid read when trimming empty string
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' of git.php.net:/php-src into PHP-5.4
Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3
- Updated to version 2012.10 (2012j)
Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
	NEWS
Enabled apache 2.4 handler build option
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Enabled apache 2.4 handler build option

Conflicts:
	sapi/apache2handler/config.w32
Updated NEWS
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Updated NEWS
UPdated NEWS
Fixed compiler reenterability
Fixed compiler reenterability