]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorMatteo Beccati <mbeccati@php.net>
Sat, 24 May 2014 22:08:41 +0000 (00:08 +0200)
committerMatteo Beccati <mbeccati@php.net>
Sat, 24 May 2014 22:08:41 +0000 (00:08 +0200)
commit370256ad4bf1e3d0c388911d3a75f693fe4ca5b0
tree80079fc064d2f571d6deddda0ffd91ab640607f8
parent666197b8cc889af6ad0dd794405e138ff4fb2c34
parent980c63651c65f4078f627409781b6d66e5834088
Merge branch 'PHP-5.5' into PHP-5.6

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