From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Date: Wed, 13 Feb 2013 12:50:53 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha5~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=65fa9f2c4b0dcb8a748085079cfed035bcef7b5b;p=php

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

65fa9f2c4b0dcb8a748085079cfed035bcef7b5b