From: Johannes Schlüter <johannes@php.net>
Date: Wed, 22 May 2013 15:15:27 +0000 (+0200)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.5.0RC2~2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cd74b7d57e8246a47c74b979c41a6fa0b56719b7;p=php

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

cd74b7d57e8246a47c74b979c41a6fa0b56719b7