From: Ferenc Kovacs Date: Wed, 26 Nov 2014 09:24:18 +0000 (+0100) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_NATIVE_TLS_MERGE~138 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=078066fbd8f2d1d547cd3efb3305cfe71d23d54a;p=php Merge branch 'PHP-5.6' * PHP-5.6: PHP-5.6.5 is next Conflicts: configure.in main/php_version.h --- 078066fbd8f2d1d547cd3efb3305cfe71d23d54a