From: Derick Rethans <github@derickrethans.nl>
Date: Sun, 6 Jan 2013 15:07:25 +0000 (+0000)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha3~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4ff088d061ed3d4e15d38d0ed3f2fd10346c634c;p=php

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

4ff088d061ed3d4e15d38d0ed3f2fd10346c634c