Merge branch 'Wikidata' of ssh://review/mediawiki/core into Wikidata
authorjeroendedauw <jeroendedauw@gmail.com>
Wed, 11 Apr 2012 10:52:25 +0000 (12:52 +0200)
committerjeroendedauw <jeroendedauw@gmail.com>
Wed, 11 Apr 2012 10:52:25 +0000 (12:52 +0200)

Trivial merge