Merge branch 'Wikidata' of ssh://review/mediawiki/core into Wikidata
authorjeroendedauw <jeroendedauw@gmail.com>
Wed, 27 Jun 2012 14:18:18 +0000 (16:18 +0200)
committerjeroendedauw <jeroendedauw@gmail.com>
Wed, 27 Jun 2012 14:18:18 +0000 (16:18 +0200)

Trivial merge