From: Pierre Joye <pierre.php@gmail.com>
Date: Wed, 15 May 2013 13:53:57 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
X-Git-Tag: php-5.4.16RC1~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=09470ebf35a47ac34c3ffa5524ccb47ff404cd5a;p=php

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

09470ebf35a47ac34c3ffa5524ccb47ff404cd5a