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

Trivial merge