Merge "Work around &$this usage in SkinTemplate"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 21 Dec 2016 18:58:02 +0000 (18:58 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 21 Dec 2016 18:58:02 +0000 (18:58 +0000)

Trivial merge