From: Ferenc Kovacs Date: Fri, 20 Mar 2015 12:34:55 +0000 (+0100) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~577 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f244220b5989267239ca31f7b0db2f2cf5ad6e5;p=php Merge branch 'PHP-5.6' * PHP-5.6: add pear to the travis build --- 8f244220b5989267239ca31f7b0db2f2cf5ad6e5