Merge "Don't parse <nowiki><span class="error"></nowiki>"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 1 Nov 2016 21:27:36 +0000 (21:27 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 1 Nov 2016 21:27:36 +0000 (21:27 +0000)

Trivial merge