]> granicus.if.org Git - php/commit
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)
commit2c8ce5ba17acec00a124f0d3100d3525e098f997
treef1585634bfdebc192c8efe52caa68f1afe698eb5
parentdc8a53d4baeb2a4c97b367b78b3d47b53fe6ecbb
parent370256ad4bf1e3d0c388911d3a75f693fe4ca5b0
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix broken Junit output with --disable-cgi