From: Andrey Hristov <andrey@php.net>
Date: Wed, 6 Aug 2014 13:59:56 +0000 (+0300)
Subject: Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
X-Git-Tag: php-5.6.0RC4~1^2~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e6a6a5d9dcd9d29ef76fb86ca716bd7f1169e6cf;p=php

Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

Conflicts:
	NEWS
---

e6a6a5d9dcd9d29ef76fb86ca716bd7f1169e6cf