From: Derick Rethans <github@derickrethans.nl>
Date: Thu, 2 Jan 2014 12:52:08 +0000 (+0000)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.6.0alpha1~55^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=405f6417f1fc5dd3cd04ab1b60f1748353465ebe;p=php

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

405f6417f1fc5dd3cd04ab1b60f1748353465ebe