]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Mon, 24 Jun 2013 06:37:10 +0000 (23:37 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 24 Jun 2013 06:37:10 +0000 (23:37 -0700)
* PHP-5.4:
  seems to be working fine for me on 32-bit


Trivial merge