From: Pierre Joye <pierre.php@gmail.com>
Date: Mon, 4 Mar 2013 13:06:09 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
X-Git-Tag: php-5.5.0alpha6~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e9a2642c8913736be422938b555fd37d2f6ce5ef;p=php

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

e9a2642c8913736be422938b555fd37d2f6ce5ef