Merge "Made User generally use DB_SLAVE by default"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 16 Jun 2015 21:17:43 +0000 (21:17 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 16 Jun 2015 21:17:43 +0000 (21:17 +0000)

Trivial merge