From: Johannes Schlüter <johannes@php.net>
Date: Thu, 21 Feb 2013 14:10:15 +0000 (+0100)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.13RC1~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1e9bc5677505585173ac105c997a09c095f34d1d;p=php

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

1e9bc5677505585173ac105c997a09c095f34d1d