From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 12 Dec 2013 12:46:37 +0000 (+0400)
Subject: Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~120
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3bddcc13b5c9f6aa0cf6113b8009c621b7867fd5;p=php

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

* 'PHP-5.6' of git.php.net:php-src:
  fix test
---

3bddcc13b5c9f6aa0cf6113b8009c621b7867fd5