]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Fri, 25 Apr 2014 15:40:33 +0000 (17:40 +0200)
committerAnatol Belski <ab@php.net>
Fri, 25 Apr 2014 15:40:33 +0000 (17:40 +0200)
* PHP-5.5:
  fixed test


Trivial merge