Merge "Kill DeviceDetection"

author awjrichards <arichards@wikimedia.org>

Mon, 26 Nov 2012 20:57:11 +0000 (20:57 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Mon, 26 Nov 2012 20:57:11 +0000 (20:57 +0000)
author awjrichards <arichards@wikimedia.org>
Mon, 26 Nov 2012 20:57:11 +0000 (20:57 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Mon, 26 Nov 2012 20:57:11 +0000 (20:57 +0000)
diff --cc includes/AutoLoader.php
Simple merge
diff --cc includes/DefaultSettings.php
Simple merge
author	awjrichards <arichards@wikimedia.org>
	Mon, 26 Nov 2012 20:57:11 +0000 (20:57 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Mon, 26 Nov 2012 20:57:11 +0000 (20:57 +0000)
		1	2
includes/AutoLoader.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history