Merge branch 'Wikidata' of ssh://gerrit.wikimedia.org:29418/mediawiki/core into Wikidata
authorNikola Smolenski <smolensk@eunet.rs>
Mon, 16 Apr 2012 15:47:29 +0000 (17:47 +0200)
committerNikola Smolenski <smolensk@eunet.rs>
Mon, 16 Apr 2012 15:47:29 +0000 (17:47 +0200)

Trivial merge