From: Yasuo Ohgaki Date: Mon, 12 May 2014 04:34:43 +0000 (+0900) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHPNG_MERGE~288 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a33a817f0ed6f61878188fc28a33aa458fe464b9;p=php Merge branch 'PHP-5.6' * PHP-5.6: Fixed bug #67199 mb_regex_encoding mishmash --- a33a817f0ed6f61878188fc28a33aa458fe464b9