From: Andrey Hristov <andrey@php.net>
Date: Tue, 15 Jan 2013 09:05:54 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5
X-Git-Tag: php-5.5.0alpha5~70
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dc495bbe95680a9cf2321da83a382d834d70758c;p=php

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

dc495bbe95680a9cf2321da83a382d834d70758c