From: Derick Rethans <github@derickrethans.nl>
Date: Mon, 11 Mar 2013 21:36:41 +0000 (+0000)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.6.0alpha1~478^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e5c64c0bda012dedf894273e9a5f018775dcf6a3;p=php

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

e5c64c0bda012dedf894273e9a5f018775dcf6a3