From: Andrey Hristov <andrey@php.net>
Date: Thu, 8 Aug 2013 11:52:09 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5
X-Git-Tag: php-5.5.2~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1e2f72d6b6e45da8db1847464b51fdb993091a72;p=php

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

1e2f72d6b6e45da8db1847464b51fdb993091a72