Merge "Move ApiQueryRecentChanges::parseRCType to static method on RecentChange"

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

Mon, 19 May 2014 18:57:25 +0000 (18:57 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Mon, 19 May 2014 18:57:25 +0000 (18:57 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 19 May 2014 18:57:25 +0000 (18:57 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Mon, 19 May 2014 18:57:25 +0000 (18:57 +0000)
diff --cc includes/api/ApiQueryRecentChanges.php
Simple merge
diff --cc includes/api/ApiQueryWatchlist.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Mon, 19 May 2014 18:57:25 +0000 (18:57 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Mon, 19 May 2014 18:57:25 +0000 (18:57 +0000)
		1	2
includes/api/ApiQueryRecentChanges.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/api/ApiQueryWatchlist.php	patch \|	diff1 \|	diff2 \|	blob \| history