Merge branch 'Wikidata' of ssh://gerrit.wikimedia.org:29418/mediawiki/core into Wikidata

author daniel <daniel.kinzler@wikimedia.de>

Tue, 17 Apr 2012 16:09:17 +0000 (18:09 +0200)

committer daniel <daniel.kinzler@wikimedia.de>

Tue, 17 Apr 2012 16:09:17 +0000 (18:09 +0200)
author daniel <daniel.kinzler@wikimedia.de>
Tue, 17 Apr 2012 16:09:17 +0000 (18:09 +0200)
committer daniel <daniel.kinzler@wikimedia.de>
Tue, 17 Apr 2012 16:09:17 +0000 (18:09 +0200)
diff --cc includes/Content.php
Simple merge
diff --cc includes/ContentHandler.php
Simple merge
diff --cc includes/EditPage.php
Simple merge
diff --cc includes/WikiPage.php
Simple merge
author	daniel <daniel.kinzler@wikimedia.de>
	Tue, 17 Apr 2012 16:09:17 +0000 (18:09 +0200)
committer	daniel <daniel.kinzler@wikimedia.de>
	Tue, 17 Apr 2012 16:09:17 +0000 (18:09 +0200)
		1	2
includes/Content.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/ContentHandler.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/EditPage.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/WikiPage.php	patch \|	diff1 \|	diff2 \|	blob \| history