From: Andrey Hristov <andrey@php.net>
Date: Mon, 14 Apr 2014 20:11:29 +0000 (+0300)
Subject: Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
X-Git-Tag: php-5.5.12RC1~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=22acea99ff3456abf316e838bfdabe37628e36f8;p=php

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

22acea99ff3456abf316e838bfdabe37628e36f8