Merge branch 'master' into Wikidata
authorJens Ohlig <jens.ohlig@wikimedia.de>
Wed, 11 Apr 2012 12:26:41 +0000 (14:26 +0200)
committerJens Ohlig <jens.ohlig@wikimedia.de>
Wed, 11 Apr 2012 12:26:41 +0000 (14:26 +0200)

Trivial merge