]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Wed, 25 Dec 2013 06:23:24 +0000 (22:23 -0800)
committerStanislav Malyshev <stas@php.net>
Wed, 25 Dec 2013 06:23:24 +0000 (22:23 -0800)
commita2503c6af38d5a2de172a9a746719c4b12b53034
treed98c27d913523a3b4959ea439746906941330dcf
parent3f7a145b5abd66d1c77e65060d15702db4d36529
parent8e5048f9fb93846846e82c42c39f1759c97a73c2
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.25 next

Conflicts:
configure.in
main/php_version.h