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

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

898ddcb9e12cbbf9c51fe5d203474caea5d65083