]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Sun, 26 Jan 2014 23:12:19 +0000 (15:12 -0800)
committerStanislav Malyshev <stas@php.net>
Sun, 26 Jan 2014 23:12:19 +0000 (15:12 -0800)
* PHP-5.5:
  XFAIL multibyte tests until they are fixed (bug 66582)


Trivial merge