Merge "Preferences: Don't load all default options for every default preference"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 12 Aug 2015 22:52:01 +0000 (22:52 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 12 Aug 2015 22:52:01 +0000 (22:52 +0000)

Trivial merge