From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Date: Sat, 20 Sep 2014 23:40:02 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.18RC1~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7958793342783a67f2ebbb2db1abf01474d3c1f4;p=php

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

7958793342783a67f2ebbb2db1abf01474d3c1f4