From: Andrey Hristov <andrey@php.net>
Date: Wed, 9 Jan 2013 14:07:26 +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.0alpha3~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=83f736aad4eaea1b2a6df70e81632a8069641894;p=php

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

83f736aad4eaea1b2a6df70e81632a8069641894