Merge "Fix error display on failing rollback" into Wikidata

author daniel <daniel.kinzler@wikimedia.de>

Wed, 29 Aug 2012 10:02:26 +0000 (10:02 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 29 Aug 2012 10:02:26 +0000 (10:02 +0000)
author daniel <daniel.kinzler@wikimedia.de>
Wed, 29 Aug 2012 10:02:26 +0000 (10:02 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 29 Aug 2012 10:02:26 +0000 (10:02 +0000)
diff --cc includes/WikiPage.php
Simple merge
diff --cc includes/actions/RollbackAction.php
Simple merge
author	daniel <daniel.kinzler@wikimedia.de>
	Wed, 29 Aug 2012 10:02:26 +0000 (10:02 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 29 Aug 2012 10:02:26 +0000 (10:02 +0000)
		1	2
includes/WikiPage.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/actions/RollbackAction.php	patch \|	diff1 \|	diff2 \|	blob \| history