From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 5 Dec 2012 09:37:40 +0000 (+0400)
Subject: Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
X-Git-Tag: php-5.5.0alpha2~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=26c165cc03267969ac313f2fd9a1fcb48435215d;p=php

Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  Two tests deactivated until #63688 was fixed
---

26c165cc03267969ac313f2fd9a1fcb48435215d