Merge "Speed up password-handling in the unit tests"

author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>

Wed, 18 May 2016 12:46:28 +0000 (12:46 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 18 May 2016 12:46:28 +0000 (12:46 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 18 May 2016 12:46:28 +0000 (12:46 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 18 May 2016 12:46:28 +0000 (12:46 +0000)
diff --cc tests/phpunit/MediaWikiTestCase.php
Simple merge
diff --cc tests/phpunit/includes/api/ApiLoginTest.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 18 May 2016 12:46:28 +0000 (12:46 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 18 May 2016 12:46:28 +0000 (12:46 +0000)
		1	2
tests/phpunit/MediaWikiTestCase.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/includes/api/ApiLoginTest.php	patch \|	diff1 \|	diff2 \|	blob \| history