sed -i 's/[ \t]*$//' **/*.php
Merge branch '3.6'
Fix PHPUnit_Framework_TestCase::hasOutput().
Merge branch '3.6'
Fix code sniffer warning
Prepare release.
Fixes #413. phpt test failures produced double diffs as ComparisonFailure exceptions already include a diff in their toString method since 452f50a
Merge branch '3.6'

Conflicts:
	ChangeLog.markdown
Merge branch '3.6' of github.com:sebastianbergmann/phpunit into 3.6
Fixed changelog. I missed that the 3.6.4 release already happend when updating it
Merge branch '3.6'

Conflicts:
	ChangeLog.markdown
	package.xml
Loading bootstrap file configured in the xml before attempting to load the tests loader. Fixes #204.
Merge pull request #421 from renansaddam/3.6-issue204
Merge branch '3.6'
Update ChangeLog.
Added assertions and contraint to verify JSON encoded data
Added corresponding functions to the json asserts
renamed JSON Mesage provider class to fit the name schema
adapted new name of the JSON message provider to all affected classes, Fixed related tests
Fix whitespace.