]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorStanislav Malyshev <stas@php.net>
Fri, 1 Mar 2013 05:29:40 +0000 (21:29 -0800)
committerStanislav Malyshev <stas@php.net>
Fri, 1 Mar 2013 05:29:40 +0000 (21:29 -0800)
commit03dfa08da93587f14106130d473168388b5009b6
treeb2121bea43c24bb2ec1316181e662fdfcc3be8fc
parent31a6f8b7f443ec03cd7ff7ed155dbeafd44c8557
parent5c5bc7cf1bb8227ca4c91d7666fb2c46812c913b
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  5.4.24-dev
  5.3.23RC1

Conflicts:
configure.in
main/php_version.h