From: Johannes Schlüter <johannes@php.net>
Date: Wed, 10 Apr 2013 07:44:34 +0000 (+0200)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.15RC1~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=146d7861370114430185bb849bda5ebb9415ca66;p=php

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

146d7861370114430185bb849bda5ebb9415ca66