From: Derick Rethans Date: Thu, 7 Aug 2014 09:25:05 +0000 (+0100) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHPNG_MERGE~19 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3fd379e1964fff01eb2cd6d0ef3eb9fb72ce5160;p=php Merge branch 'PHP-5.6' Not sure what's going wrong here for UPGRADING.INTERNALS... Conflicts: UPGRADING.INTERNALS --- 3fd379e1964fff01eb2cd6d0ef3eb9fb72ce5160