From: Ferenc Kovacs Date: Wed, 17 Dec 2014 01:18:43 +0000 (+0100) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_NATIVE_TLS_MERGE~5^2~1 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5ab1ddacca864e8b6730defd3d8291722363434d;p=php Merge branch 'PHP-5.6' * PHP-5.6: move this entry to the correct version --- 5ab1ddacca864e8b6730defd3d8291722363434d