Merge "(bug 41042) Regression: API action=parse with nonexistent page"

author Catrope <roan.kattouw@gmail.com>

Mon, 29 Oct 2012 20:03:16 +0000 (20:03 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Mon, 29 Oct 2012 20:03:16 +0000 (20:03 +0000)
author Catrope <roan.kattouw@gmail.com>
Mon, 29 Oct 2012 20:03:16 +0000 (20:03 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Mon, 29 Oct 2012 20:03:16 +0000 (20:03 +0000)
diff --cc RELEASE-NOTES-1.21
Simple merge
diff --cc includes/api/ApiParse.php
Simple merge
author	Catrope <roan.kattouw@gmail.com>
	Mon, 29 Oct 2012 20:03:16 +0000 (20:03 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Mon, 29 Oct 2012 20:03:16 +0000 (20:03 +0000)
		1	2
RELEASE-NOTES-1.21	patch \|	diff1 \|	diff2 \|	blob \| history
includes/api/ApiParse.php	patch \|	diff1 \|	diff2 \|	blob \| history