Merge "Make thumb_handler.php use MediaHandler::parseParamString"

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

Mon, 30 Sep 2013 18:11:09 +0000 (18:11 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Mon, 30 Sep 2013 18:11:09 +0000 (18:11 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 30 Sep 2013 18:11:09 +0000 (18:11 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Mon, 30 Sep 2013 18:11:09 +0000 (18:11 +0000)
diff --cc RELEASE-NOTES-1.22
Simple merge
diff --cc docs/hooks.txt
Simple merge
diff --cc includes/media/MediaHandler.php
Simple merge
diff --cc thumb.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Mon, 30 Sep 2013 18:11:09 +0000 (18:11 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Mon, 30 Sep 2013 18:11:09 +0000 (18:11 +0000)
		1	2
RELEASE-NOTES-1.22	patch \|	diff1 \|	diff2 \|	blob \| history
docs/hooks.txt	patch \|	diff1 \|	diff2 \|	blob \| history
includes/media/MediaHandler.php	patch \|	diff1 \|	diff2 \|	blob \| history
thumb.php	patch \|	diff1 \|	diff2 \|	blob \| history