]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Thu, 1 May 2014 10:50:28 +0000 (12:50 +0200)
committerFerenc Kovacs <tyrael@php.net>
Thu, 1 May 2014 10:50:28 +0000 (12:50 +0200)
* PHP-5.6:
  XFAIL the leaking multibyte tests, we should really get to the bottom of this


Trivial merge