Merge branch 'Wikidata' of ssh://review/mediawiki/core into Wikidata
authorjeroendedauw <jeroendedauw@gmail.com>
Mon, 16 Apr 2012 15:30:23 +0000 (17:30 +0200)
committerjeroendedauw <jeroendedauw@gmail.com>
Mon, 16 Apr 2012 15:30:23 +0000 (17:30 +0200)

Trivial merge