Merge branch 'Wikidata' of ssh://gerrit.wikimedia.org:29418/mediawiki/core into Wikidata
authordaniel <daniel.kinzler@wikimedia.de>
Thu, 24 May 2012 17:10:32 +0000 (19:10 +0200)
committerdaniel <daniel.kinzler@wikimedia.de>
Thu, 24 May 2012 17:10:32 +0000 (19:10 +0200)

Trivial merge