]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Wed, 16 Apr 2014 00:17:39 +0000 (17:17 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 16 Apr 2014 00:17:39 +0000 (17:17 -0700)
commitea8370c29ac6940ce4acfe48688dfa2d9745cebd
treeafda7b2870aa7e8553e8156bd2a2d33ed091f5a5
parentaaf197180a47d3fe9dfc8a25acdf89c0a7bca059
parent6bf7c10b208b88848a8eeed17caa3e2ae4f09f77
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  5.4.29 is next
  5.5.12RC1 setup

Conflicts:
configure.in
main/php_version.h