]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Tue, 18 Feb 2014 05:22:03 +0000 (21:22 -0800)
committerStanislav Malyshev <stas@php.net>
Tue, 18 Feb 2014 05:22:03 +0000 (21:22 -0800)
commit58b7f21c3ff60f8a2da4334e933d425859c3985c
tree99a57aa0dde48be67cbe739860dc7c3e455446ab
parentbd9aa181dc903a886ac76c45b11bf218948ee31b
parentc612440e0f50eea166bb8dfd375d5f848f8711f7
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.27 now
  update NEWS

Conflicts:
configure.in
main/php_version.h