]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Wed, 27 Mar 2013 21:02:14 +0000 (14:02 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 27 Mar 2013 21:02:14 +0000 (14:02 -0700)
commit5d535a007d82340d4a6973468a67c40d69d0aed3
treeee475b43e50d68e5468b5be65f0a2f2dbd631eab
parent25b3c949440471ac39ec7126b9f15fc4cbc675ea
parentf982aaafa7a3070c78da4b46bbdee9ecae02fd02
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  will be 5.4.15
  fix NEWS

Conflicts:
configure.in
main/php_version.h