Merge branch 'Wikidata' of ssh://review/mediawiki/core into Wikidata

author jeroendedauw <jeroendedauw@gmail.com>

Mon, 14 May 2012 10:02:09 +0000 (12:02 +0200)

committer jeroendedauw <jeroendedauw@gmail.com>

Mon, 14 May 2012 10:02:09 +0000 (12:02 +0200)
author jeroendedauw <jeroendedauw@gmail.com>
Mon, 14 May 2012 10:02:09 +0000 (12:02 +0200)
committer jeroendedauw <jeroendedauw@gmail.com>
Mon, 14 May 2012 10:02:09 +0000 (12:02 +0200)
diff --cc includes/Content.php
Simple merge
diff --cc includes/WikiPage.php
Simple merge
author	jeroendedauw <jeroendedauw@gmail.com>
	Mon, 14 May 2012 10:02:09 +0000 (12:02 +0200)
committer	jeroendedauw <jeroendedauw@gmail.com>
	Mon, 14 May 2012 10:02:09 +0000 (12:02 +0200)
		1	2
includes/Content.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/WikiPage.php	patch \|	diff1 \|	diff2 \|	blob \| history