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

Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
---

078b025a15a22c290f36e66b0c3336376623266e