]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorMatteo Beccati <mbeccati@php.net>
Tue, 27 May 2014 09:07:52 +0000 (11:07 +0200)
committerMatteo Beccati <mbeccati@php.net>
Tue, 27 May 2014 09:07:52 +0000 (11:07 +0200)
* PHP-5.6:
  Fixed broken XML junit output due to escaping of CDATA sections


Trivial merge