Merge "Stop doing $that = $this in includes/changes"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 11 Feb 2016 02:26:06 +0000 (02:26 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 11 Feb 2016 02:26:06 +0000 (02:26 +0000)

Trivial merge