Merge "Avoid use of DatabaseBase in /includes"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 2 Dec 2016 20:54:26 +0000 (20:54 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 2 Dec 2016 20:54:26 +0000 (20:54 +0000)

Trivial merge