From: Pierre Joye <pierre.php@gmail.com>
Date: Wed, 10 Apr 2013 18:15:03 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
X-Git-Tag: php-5.5.0beta4~47
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6ea7e6da8bbcf24e424772f017c822c99a9ab4c6;p=php

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

6ea7e6da8bbcf24e424772f017c822c99a9ab4c6