Merge branch 'Wikidata' of ssh://gerrit.wikimedia.org:29418/mediawiki/core into Wikidata
authordaniel <daniel.kinzler@wikimedia.de>
Wed, 13 Jun 2012 10:31:30 +0000 (12:31 +0200)
committerdaniel <daniel.kinzler@wikimedia.de>
Wed, 13 Jun 2012 10:31:30 +0000 (12:31 +0200)

Trivial merge