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

Merge branch 'PHP-5.5' into PHP-5.6

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

370256ad4bf1e3d0c388911d3a75f693fe4ca5b0