]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Tue, 8 Jul 2014 07:54:12 +0000 (09:54 +0200)
committerAnatol Belski <ab@php.net>
Tue, 8 Jul 2014 07:54:12 +0000 (09:54 +0200)
* PHP-5.4:
  Backported the patch from bug #67407 into 5.4


Trivial merge