From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 12 Dec 2013 12:46:49 +0000 (+0400)
Subject: Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
X-Git-Tag: php-5.5.8RC1~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=711d8c2c7b033ccc63db98b762136218786c2f22;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:
  fix test
---

711d8c2c7b033ccc63db98b762136218786c2f22