Merge "Added MediaWikiTestCase::assertTypeOrValue to facilitate common type checks"

author Daniel Kinzler <daniel.kinzler@wikimedia.de>

Fri, 14 Sep 2012 10:08:44 +0000 (10:08 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 14 Sep 2012 10:08:44 +0000 (10:08 +0000)
author Daniel Kinzler <daniel.kinzler@wikimedia.de>
Fri, 14 Sep 2012 10:08:44 +0000 (10:08 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 14 Sep 2012 10:08:44 +0000 (10:08 +0000)
diff --cc tests/phpunit/MediaWikiTestCase.php
Simple merge
author	Daniel Kinzler <daniel.kinzler@wikimedia.de>
	Fri, 14 Sep 2012 10:08:44 +0000 (10:08 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 14 Sep 2012 10:08:44 +0000 (10:08 +0000)