]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Wed, 16 Apr 2014 00:15:21 +0000 (17:15 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 16 Apr 2014 00:15:21 +0000 (17:15 -0700)
commit6bf7c10b208b88848a8eeed17caa3e2ae4f09f77
tree20c00dad447c117ba2421feeeadc3ac5898ce9e0
parentb8d029435dd436487a455a758e8dc10d1c94096e
parent1d34d822315a97bb7d3eeb3b9e75f34807ac4a12
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.29 is next

Conflicts:
configure.in
main/php_version.h