From: Stanislav Malyshev Date: Sun, 10 May 2015 02:00:40 +0000 (-0700) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~54 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c8889e7d470e0e20d2cab641c9833b4b3b8c6ac;p=php Merge branch 'PHP-5.6' * PHP-5.6: Fix #48147 - implement manual handling of //IGNORE for broken libc Conflicts: ext/iconv/iconv.c --- 8c8889e7d470e0e20d2cab641c9833b4b3b8c6ac