From: Andrey Hristov <andrey@php.net>
Date: Tue, 18 Mar 2014 13:42:57 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~469^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=39c53031e0db840f56bfbf2dcef6713365c266ce;p=php

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

39c53031e0db840f56bfbf2dcef6713365c266ce