]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorYasuo Ohgaki <yohgaki@php.net>
Mon, 12 May 2014 04:34:43 +0000 (13:34 +0900)
committerYasuo Ohgaki <yohgaki@php.net>
Mon, 12 May 2014 04:34:43 +0000 (13:34 +0900)
* PHP-5.6:
  Fixed bug #67199 mb_regex_encoding mishmash


Trivial merge