Merge "Avoid assignment in return in TemplateParser.php"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 18 Jun 2015 20:57:08 +0000 (20:57 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 18 Jun 2015 20:57:08 +0000 (20:57 +0000)

Trivial merge