From: Matteo Beccati Date: Tue, 27 May 2014 09:07:32 +0000 (+0200) Subject: Merge branch 'PHP-5.5' into PHP-5.6 X-Git-Tag: PRE_PHPNG_MERGE~259^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cc3a1af62a803120ebe478c85541482179d43cfb;p=php Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: Fixed broken XML junit output due to escaping of CDATA sections --- cc3a1af62a803120ebe478c85541482179d43cfb