]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Tue, 20 Aug 2013 06:23:21 +0000 (23:23 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 20 Aug 2013 06:23:21 +0000 (23:23 -0700)
commit53d96434313f245e07990ea910820b102a9bc3d7
treec70c3f272fb3075392d19772a7486231c361a6ff
parent1a00b9bd264ba2495930be05cd0ed2b1c13b8ef8
parentd487f5e9acc55fb76d71c40e451efebbc087af35
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  bump version
  Update NEWS

Conflicts:
configure.in
main/php_version.h
NEWS
configure.in
main/php_version.h