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


Trivial merge