From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Date: Fri, 10 Oct 2014 09:44:52 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.3RC1~59^2~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8aa952410a49b01fa7e2722a73e3136676d1af95;p=php

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

8aa952410a49b01fa7e2722a73e3136676d1af95