From: Andrey Hristov <andrey@php.net>
Date: Wed, 26 Mar 2014 12:27:25 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~442^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7ccbfb2e8467f4a5bec90209254f78ffb948755e;p=php

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

7ccbfb2e8467f4a5bec90209254f78ffb948755e