From: Johannes Schlüter <johannes@php.net>
Date: Tue, 29 Jan 2013 18:50:14 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha5~57
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=78d3e66f3ae4230cee0c28722284948201e001d8;p=php

Merge branch 'PHP-5.4' into PHP-5.5
---

78d3e66f3ae4230cee0c28722284948201e001d8