From: Johannes Schlüter <johannes@php.net>
Date: Wed, 10 Jul 2013 17:46:37 +0000 (+0200)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.18RC1~29^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4c6c048e3efe137ec6c1756585e34de1b9332817;p=php

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

4c6c048e3efe137ec6c1756585e34de1b9332817