From: Johannes Schlüter <johannes@php.net>
Date: Thu, 13 Dec 2012 21:40:23 +0000 (+0100)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.5.0alpha2~16^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ef37055c344da33f6f42b4cdbf9c1a928a52063a;p=php

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

ef37055c344da33f6f42b4cdbf9c1a928a52063a