From: Andrey Hristov Date: Wed, 16 Jul 2014 16:25:31 +0000 (+0300) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHPNG_MERGE~80 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d6805d4982999bd302b13dbe6052e10de7f9db2;p=php Merge branch 'PHP-5.6' Conflicts: NEWS --- 5d6805d4982999bd302b13dbe6052e10de7f9db2