From: Andrey Hristov <andrey@php.net>
Date: Wed, 4 Dec 2013 16:32:32 +0000 (+0200)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: PRE_PHPNG_MERGE~353^2~171
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0cb38a3d2606740b0b3c048351632f250a855909;p=php

Merge branch 'master' of git.php.net:php-src

Conflicts:
	NEWS
---

0cb38a3d2606740b0b3c048351632f250a855909