From: Matteo Beccati Date: Tue, 16 Sep 2014 08:23:03 +0000 (+0200) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_NATIVE_TLS_MERGE~158^2~85^2~4 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2508ce7aef7aa4a984d793e3c7f7898eaf6e8e03;p=php Merge branch 'PHP-5.6' * PHP-5.6: Fixed freetype test on multiple environments --- 2508ce7aef7aa4a984d793e3c7f7898eaf6e8e03