Merge "[Upload] Moved async upload stuff to the job queue."

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

Tue, 26 Feb 2013 23:58:32 +0000 (23:58 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 26 Feb 2013 23:58:32 +0000 (23:58 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 26 Feb 2013 23:58:32 +0000 (23:58 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 26 Feb 2013 23:58:32 +0000 (23:58 +0000)
diff --cc includes/AutoLoader.php
Simple merge
diff --cc includes/DefaultSettings.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Tue, 26 Feb 2013 23:58:32 +0000 (23:58 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 26 Feb 2013 23:58:32 +0000 (23:58 +0000)
		1	2
includes/AutoLoader.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history