From: Johannes Schlüter <johannes@php.net>
Date: Thu, 20 Jun 2013 09:52:29 +0000 (+0200)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.18RC1~62
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b5978e239ee308e425843e40eb6ab2a9f0beba83;p=php

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

b5978e239ee308e425843e40eb6ab2a9f0beba83