Merge "Simplify the logic to decide whether to show "variant" and "noconvertlink...
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 26 Apr 2013 15:12:38 +0000 (15:12 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 26 Apr 2013 15:12:38 +0000 (15:12 +0000)

Trivial merge