From: Johannes Schlüter <johannes@php.net>
Date: Mon, 10 Dec 2012 12:35:57 +0000 (+0100)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.5.0alpha2~31^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=95fd52ff3d3cc2162baf4d30fe06cf37da398050;p=php

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

95fd52ff3d3cc2162baf4d30fe06cf37da398050