Merge "Reduced DB contention in User::saveOptions()."
authorAaron Schulz <aschulz@wikimedia.org>
Wed, 17 Apr 2013 17:58:03 +0000 (17:58 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 17 Apr 2013 17:58:03 +0000 (17:58 +0000)

Trivial merge