From: Pierre Joye <pierre.php@gmail.com>
Date: Sat, 20 Apr 2013 16:25:27 +0000 (+0200)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=39d203afb04e057689d1cb6bc380792e6753cffa;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
---

39d203afb04e057689d1cb6bc380792e6753cffa