From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Date: Sat, 20 Sep 2014 23:42:12 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.4RC1~59^2~30
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8312836c7407d2398285432a11db13f2f79570e3;p=php

Merge branch 'PHP-5.5' into PHP-5.6
---

8312836c7407d2398285432a11db13f2f79570e3