From: Peter Cowburn Date: Wed, 19 Nov 2014 17:06:59 +0000 (+0000) Subject: Merge branch 'PHP-5.6' X-Git-Tag: POST_NATIVE_TLS_MERGE^2~44^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f7674519804dc7000a56ef9fe12c49461ff0333a;p=php Merge branch 'PHP-5.6' * PHP-5.6: NEWS Fix #68355: Inconsistency in example php.ini comments --- f7674519804dc7000a56ef9fe12c49461ff0333a