From: Pierre Joye <pierre.php@gmail.com>
Date: Sat, 27 Apr 2013 16:00:02 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
X-Git-Tag: php-5.5.0RC1~32^2~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9877773438a46385710fc3e1314fb7a956da09b6;p=php

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

9877773438a46385710fc3e1314fb7a956da09b6