From: Derick Rethans <github@derickrethans.nl>
Date: Sun, 3 Mar 2013 18:10:07 +0000 (-0500)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha6~12^2~2^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=47ac3ec1f4c2fbad0f72aa76346f96ba52ecf2bc;p=php

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

47ac3ec1f4c2fbad0f72aa76346f96ba52ecf2bc