From: Nikita Popov <nikic@php.net>
Date: Fri, 13 Mar 2015 15:24:57 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.8RC1~82
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b930e156f161d3e9f7526fd9ba840923833a316;p=php

Merge branch 'PHP-5.5' into PHP-5.6
---

4b930e156f161d3e9f7526fd9ba840923833a316