Merge "Fix CodeSniffer and warnings in includes/db"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 12 Mar 2014 18:34:25 +0000 (18:34 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 12 Mar 2014 18:34:25 +0000 (18:34 +0000)

Trivial merge