Merge "Made saveSettings() CAS check handle caught DB exceptions better"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 16 Apr 2015 18:07:34 +0000 (18:07 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 16 Apr 2015 18:07:34 +0000 (18:07 +0000)

Trivial merge