From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 30 Jul 2013 23:04:48 +0000 (+0400)
Subject: Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
X-Git-Tag: php-5.5.2RC1~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2bd23530d83c09add1d4fd36cdea77f7d3746504;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:
---

2bd23530d83c09add1d4fd36cdea77f7d3746504