]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorMatteo Beccati <mbeccati@php.net>
Sat, 24 May 2014 22:08:56 +0000 (00:08 +0200)
committerMatteo Beccati <mbeccati@php.net>
Sat, 24 May 2014 22:08:56 +0000 (00:08 +0200)
* PHP-5.6:
  Fix broken Junit output with --disable-cgi


Trivial merge