]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Sat, 14 Mar 2015 17:30:32 +0000 (18:30 +0100)
committerAnatol Belski <ab@php.net>
Sat, 14 Mar 2015 17:30:32 +0000 (18:30 +0100)
* PHP-5.5:
  fix test


Trivial merge