From: Johannes Schlüter <johannes@schlueters.de>
Date: Thu, 29 Mar 2012 08:57:57 +0000 (+0200)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.4RC1~175
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0bca6214c642f026a2260994c7169aa1504cd26c;p=php

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
---

0bca6214c642f026a2260994c7169aa1504cd26c