From: Matteo Beccati <mbeccati@php.net>
Date: Fri, 31 May 2013 14:27:01 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0RC3~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d19e46d9d4320dfa2a501d1ef130cd09b060a993;p=php

Merge branch 'PHP-5.4' into PHP-5.5
---

d19e46d9d4320dfa2a501d1ef130cd09b060a993