]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Wed, 24 Apr 2013 17:16:56 +0000 (10:16 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 24 Apr 2013 17:16:56 +0000 (10:16 -0700)
commitcf9db2154e3078060f7113d7e9bfeeaf985b94c8
treedd1cac1edf2e81481b1cbcef78680e54082db48c
parent26bd2cba815e01d9c20beba9b36d64fe27ce5740
parenta58a279d7bf3e37e8780b8c1c276116fc0fa803e
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.16-dev

Conflicts:
configure.in
main/php_version.h