Merge "Ignore duplicate key errors in update-keys.sql"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 10 Sep 2014 17:20:10 +0000 (17:20 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 10 Sep 2014 17:20:10 +0000 (17:20 +0000)

Trivial merge