Merge "Some clean-up of TemplateParser"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 20 Feb 2015 19:10:20 +0000 (19:10 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 20 Feb 2015 19:10:20 +0000 (19:10 +0000)

Trivial merge