Merge "Cleaned up DatabaseBase constructor to use an array"

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

Thu, 7 Nov 2013 19:36:22 +0000 (19:36 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 7 Nov 2013 19:36:22 +0000 (19:36 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 7 Nov 2013 19:36:22 +0000 (19:36 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 7 Nov 2013 19:36:22 +0000 (19:36 +0000)
diff --cc includes/db/Database.php
Simple merge
diff --cc tests/phpunit/includes/db/DatabaseMysqlBaseTest.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Thu, 7 Nov 2013 19:36:22 +0000 (19:36 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 7 Nov 2013 19:36:22 +0000 (19:36 +0000)
		1	2
includes/db/Database.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/includes/db/DatabaseMysqlBaseTest.php	patch \|	diff1 \|	diff2 \|	blob \| history