From: Matteo Beccati <mbeccati@php.net>
Date: Sat, 24 May 2014 22:08:56 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~265
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2c8ce5ba17acec00a124f0d3100d3525e098f997;p=php

Merge branch 'PHP-5.6'

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

2c8ce5ba17acec00a124f0d3100d3525e098f997