Merge "TemplateParser: Use context makeKey() instead of wfMemcKey()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 22 Oct 2015 00:11:29 +0000 (00:11 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 22 Oct 2015 00:11:29 +0000 (00:11 +0000)

Trivial merge