]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Tue, 2 Sep 2014 22:03:54 +0000 (15:03 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 2 Sep 2014 22:03:54 +0000 (15:03 -0700)
commita734acd4398abcbf6130b3d091bcb8a6ce7ec70d
tree5466875f719d4841abdad75188d9d3e80636c1e2
parent70f92aa97e75a9bfa6a0377f9ef0574efcbe6280
parent5e95b61639911f84f0cb16fb0a968f8c246d8a20
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.34 is next

Conflicts:
configure.in
main/php_version.h