]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Wed, 17 Jul 2013 20:52:25 +0000 (13:52 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 17 Jul 2013 20:52:25 +0000 (13:52 -0700)
commitfec93992de67a3bc30559e0a741b6ca5e0db8025
treec53a81201748b97aa7dcf07f10bf09bedea558aa
parent31edf4df56a82d92631e25e7dd7c2bf6c8e00b99
parentb9e3f737d95ba1d6e8e3e3ec4af6d5624dc50234
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.19 is next

Conflicts:
configure.in
main/php_version.h