]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Wed, 27 Feb 2013 06:26:36 +0000 (22:26 -0800)
committerStanislav Malyshev <stas@php.net>
Wed, 27 Feb 2013 06:26:36 +0000 (22:26 -0800)
commit0d65a85cc0b1c789ad70e32c97a2a82064d80a9f
tree343a8dbbcdf10efccf0860dd8f086128d34f2bb8
parent84b65cf7abbecf0866f829f269f2208dcb44f5ca
parent31a6f8b7f443ec03cd7ff7ed155dbeafd44c8557
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.13 branched, now it's 5.4.14

Conflicts:
configure.in
main/php_version.h