From: Matteo Beccati <mbeccati@php.net>
Date: Tue, 27 May 2014 09:07:19 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.14RC1~47
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=56bcb22afb5040d49439f0a0d238f8a013ebec48;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed broken XML junit output due to escaping of CDATA sections
---

56bcb22afb5040d49439f0a0d238f8a013ebec48