Merge "Correctly parse <indicator/> contents, Parser rejiggering"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 4 Nov 2014 19:41:26 +0000 (19:41 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 4 Nov 2014 19:41:26 +0000 (19:41 +0000)

Trivial merge