Merge "(bug 30410) Remove deprecated $wgFilterCallback. The 'filtered' API error...

author Brion VIBBER <brion@wikimedia.org>

Thu, 26 Apr 2012 23:15:16 +0000 (23:15 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 26 Apr 2012 23:15:16 +0000 (23:15 +0000)
author Brion VIBBER <brion@wikimedia.org>
Thu, 26 Apr 2012 23:15:16 +0000 (23:15 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 26 Apr 2012 23:15:16 +0000 (23:15 +0000)
diff --cc RELEASE-NOTES-1.20
Simple merge
diff --cc includes/EditPage.php
Simple merge
author	Brion VIBBER <brion@wikimedia.org>
	Thu, 26 Apr 2012 23:15:16 +0000 (23:15 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 26 Apr 2012 23:15:16 +0000 (23:15 +0000)
		1	2
RELEASE-NOTES-1.20	patch \|	diff1 \|	diff2 \|	blob \| history
includes/EditPage.php	patch \|	diff1 \|	diff2 \|	blob \| history