From: Pierre Joye <pierre.php@gmail.com>
Date: Wed, 15 May 2013 13:54:52 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0RC2~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9accfee55f80ec7da23bb948c49fcaa3e97bc2ca;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
---

9accfee55f80ec7da23bb948c49fcaa3e97bc2ca