Merge branch '3.6' into 3.6-php5.1.3

Conflicts:
	.gitattributes
	ChangeLog.markdown
	PHPUnit/Autoload.php
	PHPUnit/Framework/Constraint/IsEqual.php
	PHPUnit/Framework/Process/TestCaseMethod.tpl.dist
	PHPUnit/Runner/IncludePathTestCollector.php
	PHPUnit/Tests/Extensions/OutputTestCaseTest.php
	PHPUnit/Tests/Fixtures/OutputTestCase.php
	PHPUnit/Tests/Framework/AssertTest.php
	PHPUnit/Tests/Framework/ComparisonFailureTest.php
	PHPUnit/Tests/Framework/ConstraintTest.php
	PHPUnit/Tests/Framework/SuiteTest.php
	PHPUnit/Tests/Framework/TestCaseTest.php
	PHPUnit/Tests/Framework/TestFailureTest.php
	PHPUnit/Tests/Framework/TestImplementorTest.php
	PHPUnit/Tests/Framework/TestListenerTest.php
	PHPUnit/Tests/Regression/578/Issue578Test.php
	PHPUnit/Tests/Runner/BaseTestRunnerTest.php
	PHPUnit/Tests/TextUI/dataprovider-log-xml-isolation.phpt
	PHPUnit/Tests/TextUI/dataprovider-log-xml.phpt
	PHPUnit/Tests/TextUI/help.phpt
	PHPUnit/Tests/TextUI/story-isolation.phpt
	PHPUnit/Tests/Util/ConfigurationTest.php
	PHPUnit/Tests/Util/TestTest.php
	PHPUnit/TextUI/TestRunner.php
	PHPUnit/Util/Configuration.php
	PHPUnit/Util/ErrorHandler.php
	PHPUnit/Util/GlobalState.php
	PHPUnit/Util/Log/TAP.php
	Tests/TextUI/dataprovider-testdox.phpt
	Tests/TextUI/debug.phpt
	Tests/TextUI/dependencies-isolation.phpt
	Tests/TextUI/dependencies.phpt
	Tests/TextUI/log-json.phpt
	Tests/TextUI/log-tap.phpt
	Tests/TextUI/log-xml.phpt
	Tests/TextUI/skeleton.phpt
	Tests/TextUI/tap.phpt
	Tests/TextUI/testdox-html.phpt
	Tests/_files/Book.php
	Tests/_files/MockRunner.php
	Tests/_files/ThrowExceptionTestCase.php
	build/assertions.php
	phpunit.php
	phpunit.xml.dist