]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Fri, 21 Nov 2014 12:57:46 +0000 (13:57 +0100)
committerAnatol Belski <ab@php.net>
Fri, 21 Nov 2014 12:57:46 +0000 (13:57 +0100)
* PHP-5.5:
  fixed test


Trivial merge