Merge "Fix FOUC on preferences."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 14 Jun 2013 03:29:59 +0000 (03:29 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 14 Jun 2013 03:29:59 +0000 (03:29 +0000)

Trivial merge