From: Anatol Belski Date: Fri, 5 Dec 2014 10:08:55 +0000 (+0100) Subject: Merge branch 'PHP-5.5' into PHP-5.6 X-Git-Tag: PRE_NATIVE_TLS_MERGE~60^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0e09e5e6fa55593936c473ebfa705e7455d3fafe;p=php Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: Fixed bug #65769 localeconv() broken in TS builds --- 0e09e5e6fa55593936c473ebfa705e7455d3fafe