]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Fri, 22 May 2015 19:27:19 +0000 (21:27 +0200)
committerAnatol Belski <ab@php.net>
Fri, 22 May 2015 19:27:19 +0000 (21:27 +0200)
* PHP-5.5:
  fix test


Trivial merge