Merge "Stop doing $that = $this in includes/db"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 10 Feb 2016 18:40:31 +0000 (18:40 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 10 Feb 2016 18:40:31 +0000 (18:40 +0000)

Trivial merge