From: Ferenc Kovacs Date: Mon, 30 Jun 2014 10:31:25 +0000 (+0200) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHPNG_MERGE~148 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=62b45983f7441d40dfbf9f115d212575f684d3a2;p=php Merge branch 'PHP-5.6' * PHP-5.6: --enable-fpm for the travis build --- 62b45983f7441d40dfbf9f115d212575f684d3a2