Merge "Avoid key conflict errors in User::addToDatabase"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 26 Jun 2014 15:50:33 +0000 (15:50 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 26 Jun 2014 15:50:33 +0000 (15:50 +0000)

Trivial merge