From: Johannes Schlüter <johannes@php.net>
Date: Thu, 28 Mar 2013 14:09:06 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.6.0alpha1~448^2~66^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e6ef89861e74563f19b37f443141a4f765bafa6e;p=php

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

e6ef89861e74563f19b37f443141a4f765bafa6e