]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
authorDmitry Stogov <dmitry@zend.com>
Wed, 5 Dec 2012 09:37:40 +0000 (13:37 +0400)
committerDmitry Stogov <dmitry@zend.com>
Wed, 5 Dec 2012 09:37:40 +0000 (13:37 +0400)
* 'PHP-5.5' of git.php.net:php-src:
  Two tests deactivated until #63688 was fixed


Trivial merge