From: Sebastian Bergmann <sb@sebastian-bergmann.de>
Date: Mon, 19 Mar 2012 17:26:01 +0000 (+0100)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~425
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ae5e8ad9c3e1594bdd56db302347e34456c9478c;p=php

Merge branch 'PHP-5.4'
---

ae5e8ad9c3e1594bdd56db302347e34456c9478c