Merge branch 'Wikidata' of ssh://gerrit.wikimedia.org:29418/mediawiki/core into Wikidata
authordaniel <daniel.kinzler@wikimedia.de>
Mon, 16 Apr 2012 09:52:37 +0000 (11:52 +0200)
committerdaniel <daniel.kinzler@wikimedia.de>
Mon, 16 Apr 2012 09:52:37 +0000 (11:52 +0200)
commitef27863d9f46e43ef0b2aeeeb02602fee6c5ef26
tree9aec1641be45ed8fd06664c578043dea22ce5ab4
parent18b02520aaaa19b63b2dd46a7ccf25e8ec5560f4
parent533b9a7b56c04469be9f2ef4bd417c741f03bc9d
Merge branch 'Wikidata' of ssh://gerrit.wikimedia.org:29418/mediawiki/core into Wikidata

Getting synced after Jeroen and Jens essentially rebased the core branch.

Conflicts:
includes/ContentHandler.php

Change-Id: I82efd272694ec5761fedf52f85b153a140e268e5
includes/Article.php
includes/Content.php
includes/ContentHandler.php
includes/EditPage.php
includes/api/ApiParse.php