]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatoliy Belsky <ab@php.net>
Mon, 3 Dec 2012 14:16:34 +0000 (15:16 +0100)
committerAnatoliy Belsky <ab@php.net>
Mon, 3 Dec 2012 14:16:34 +0000 (15:16 +0100)
* PHP-5.4:
  Revert the previous test fix


Trivial merge