Merge "Revert "User::saveOptions() optimization""
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 31 Jan 2014 00:41:55 +0000 (00:41 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 31 Jan 2014 00:41:55 +0000 (00:41 +0000)

Trivial merge