Merge branch 'PHP-5.4' into PHP-5.5
authorMatteo Beccati <mbeccati@php.net>
Sat, 24 May 2014 22:08:32 +0000 (00:08 +0200)
committerMatteo Beccati <mbeccati@php.net>
Sat, 24 May 2014 22:08:32 +0000 (00:08 +0200)
commit980c63651c65f4078f627409781b6d66e5834088
treee117f73389df024c28f9be96b959d6f961eec464
parent4a773c0e5881968cf10f17dafb3f230867e8596e
parentf9357b44f3d0871ca737650201366a32118bc3d6
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix broken Junit output with --disable-cgi
run-tests.php