From: Andrey Hristov <andrey@php.net>
Date: Wed, 6 Aug 2014 14:04:30 +0000 (+0300)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~22^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f6b96d4c4c5abd004b572731aad0f96c72aa7e2e;p=php

Merge branch 'PHP-5.6'

Conflicts:
	NEWS
---

f6b96d4c4c5abd004b572731aad0f96c72aa7e2e