]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Thu, 24 Apr 2014 17:52:53 +0000 (19:52 +0200)
committerAnatol Belski <ab@php.net>
Thu, 24 Apr 2014 17:52:53 +0000 (19:52 +0200)
* PHP-5.5:
  backport this piece from 5.6, related to the #66307 fix


Trivial merge