]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Thu, 21 Nov 2013 20:29:02 +0000 (21:29 +0100)
committerAnatol Belski <ab@php.net>
Thu, 21 Nov 2013 20:29:02 +0000 (21:29 +0100)
* PHP-5.4:
  fixed test


Trivial merge