Merge "Optimize how user options are delivered to the client"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 5 Dec 2014 19:43:06 +0000 (19:43 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 5 Dec 2014 19:43:06 +0000 (19:43 +0000)

Trivial merge