]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Sat, 23 Mar 2013 20:00:46 +0000 (21:00 +0100)
committerAnatol Belski <ab@php.net>
Sat, 23 Mar 2013 20:00:46 +0000 (21:00 +0100)
* PHP-5.4:
  Reworked the changes for bug #64452


Trivial merge