From: Arnaud Le Blanc <arnaud.lb@gmail.com>
Date: Sun, 13 Jan 2013 14:47:12 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha4~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=718afb9acf01bd0b7bc2b3786c2c6232a4df38e4;p=php

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

718afb9acf01bd0b7bc2b3786c2c6232a4df38e4