From: Andrey Hristov <andrey@php.net>
Date: Tue, 16 Oct 2012 13:06:22 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.php.net/php-src
X-Git-Tag: php-5.5.0alpha1~28^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=54cbf5315c11172eeba9231d0f0f7f3174dee210;p=php

Merge branch 'master' of ssh://git.php.net/php-src
---

54cbf5315c11172eeba9231d0f0f7f3174dee210