]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatoliy Belsky <ab@php.net>
Mon, 3 Dec 2012 09:44:10 +0000 (10:44 +0100)
committerAnatoliy Belsky <ab@php.net>
Mon, 3 Dec 2012 09:44:10 +0000 (10:44 +0100)
* PHP-5.4:
  Fix test with a slightly different warning in TS


Trivial merge