]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Fri, 1 Mar 2013 05:30:02 +0000 (21:30 -0800)
committerStanislav Malyshev <stas@php.net>
Fri, 1 Mar 2013 05:30:02 +0000 (21:30 -0800)
* PHP-5.4:
  5.4.24-dev
  5.3.23RC1


Trivial merge