]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorAnatoliy Belsky <ab@php.net>
Wed, 5 Dec 2012 08:57:36 +0000 (09:57 +0100)
committerAnatoliy Belsky <ab@php.net>
Wed, 5 Dec 2012 08:57:36 +0000 (09:57 +0100)
* PHP-5.3:
  Two tests deactivated until #63688 was fixed


Trivial merge