]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Tue, 29 Jan 2013 20:34:45 +0000 (12:34 -0800)
committerStanislav Malyshev <stas@php.net>
Tue, 29 Jan 2013 20:34:45 +0000 (12:34 -0800)
commit26de5cc57fa39b9682cd5523711638d98fa6fddd
treec250e3485d839e5e013633fc442563c64f0eca33
parent748b37654df5f89c6630e74385e3f8a6fdf26ebe
parent09b6e33b409c249531abb228b7a90e01cb94a0ae
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  branched 5.4.12
  update NEWS

Conflicts:
configure.in
main/php_version.h