From: Sebastian Bergmann <sb@sebastian-bergmann.de>
Date: Mon, 19 Mar 2012 17:25:49 +0000 (+0100)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: PHP-5.4.1-RC1~22^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5bfd8920a2782e8347bcf15a4a702b0213b165f6;p=php

Merge branch 'PHP-5.3' into PHP-5.4
---

5bfd8920a2782e8347bcf15a4a702b0213b165f6