From: Andrey Hristov Date: Tue, 28 Jan 2014 13:57:48 +0000 (+0200) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHPNG_MERGE~353^2~61^2~12 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3834771b2ef7f6d03cd9b8da2a3da14501f58906;p=php Merge branch 'PHP-5.6' Conflicts: NEWS UPGRADING --- 3834771b2ef7f6d03cd9b8da2a3da14501f58906