From: Andrey Hristov <andrey@php.net>
Date: Thu, 20 Mar 2014 14:30:01 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~455^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d2ab74588e31dee2cc9e6d2245c2b42de2a90c55;p=php

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

d2ab74588e31dee2cc9e6d2245c2b42de2a90c55