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

author daniel <daniel.kinzler@wikimedia.de>

Wed, 6 Jun 2012 15:43:57 +0000 (17:43 +0200)

committer daniel <daniel.kinzler@wikimedia.de>

Wed, 6 Jun 2012 15:43:57 +0000 (17:43 +0200)
author daniel <daniel.kinzler@wikimedia.de>
Wed, 6 Jun 2012 15:43:57 +0000 (17:43 +0200)
committer daniel <daniel.kinzler@wikimedia.de>
Wed, 6 Jun 2012 15:43:57 +0000 (17:43 +0200)
diff --cc includes/LinksUpdate.php
Simple merge
diff --cc includes/Revision.php
Simple merge
diff --cc includes/WikiPage.php
Simple merge
author	daniel <daniel.kinzler@wikimedia.de>
	Wed, 6 Jun 2012 15:43:57 +0000 (17:43 +0200)
committer	daniel <daniel.kinzler@wikimedia.de>
	Wed, 6 Jun 2012 15:43:57 +0000 (17:43 +0200)
		1	2
includes/LinksUpdate.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/Revision.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/WikiPage.php	patch \|	diff1 \|	diff2 \|	blob \| history