Merge "Use canonical parser options per default" into Wikidata
authordaniel <daniel.kinzler@wikimedia.de>
Thu, 4 Oct 2012 11:04:50 +0000 (11:04 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 4 Oct 2012 11:04:50 +0000 (11:04 +0000)

Trivial merge