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

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

878bef2a1d8664ca5207b3f6963f68abee6da62f