]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Sun, 16 Jun 2013 22:10:32 +0000 (00:10 +0200)
committerAnatol Belski <ab@php.net>
Sun, 16 Jun 2013 22:10:32 +0000 (00:10 +0200)
* PHP-5.4:
  fix test


Trivial merge