Merge "(bug 43498) (bug 43574) Two wikilink types and {{int:}}."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 15 Jan 2013 21:04:46 +0000 (21:04 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 15 Jan 2013 21:04:46 +0000 (21:04 +0000)

Trivial merge