]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Wed, 19 Mar 2014 06:24:09 +0000 (23:24 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 19 Mar 2014 06:24:09 +0000 (23:24 -0700)
commit1ff28cd0ec954fc3ab69c239a945a99d4f09c5b1
tree73dd88813e894df905e060f010186e346442fc99
parent2dfb8fbdf4f73f7a1f7f3abf86aff0425637bc0a
parent9b88bc494e5e749039bd0166723b6b0a35de5a3e
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  prep for 5.4.27 rc1

Conflicts:
configure.in
main/php_version.h