Merge "Allow to set a salt for the edit token in HTMLForm"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 8 Jul 2014 21:08:12 +0000 (21:08 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 8 Jul 2014 21:08:12 +0000 (21:08 +0000)

Trivial merge