From: Pierre Joye <pierre.php@gmail.com>
Date: Tue, 30 Apr 2013 06:01:52 +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~13^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=83682d8833f6885d17f8bfcab3c261113d85cbbb;p=php

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

83682d8833f6885d17f8bfcab3c261113d85cbbb