]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Tue, 3 Jun 2014 18:51:51 +0000 (20:51 +0200)
committerAnatol Belski <ab@php.net>
Tue, 3 Jun 2014 18:51:51 +0000 (20:51 +0200)
* PHP-5.5:
  Fixed regression introduced by patch for bug #67072


Trivial merge