Merge "Don't match HTML entities in language conversion syntax"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 20 Oct 2013 20:59:15 +0000 (20:59 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 20 Oct 2013 20:59:15 +0000 (20:59 +0000)

Trivial merge