]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Mon, 8 Jun 2015 11:28:23 +0000 (13:28 +0200)
committerAnatol Belski <ab@php.net>
Mon, 8 Jun 2015 11:28:23 +0000 (13:28 +0200)
* PHP-5.5:
  fixed test related to fix for bug #67805


Trivial merge