Merge "(bug 40124) allow arbitrary user preferences prefixed with 'userjs-'"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 13 Jan 2013 18:13:50 +0000 (18:13 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 13 Jan 2013 18:13:50 +0000 (18:13 +0000)

Trivial merge