Merge "Note that you shouldn't use a custom $salt for 'edit' or 'csrf'"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 16 Aug 2016 22:30:45 +0000 (22:30 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 16 Aug 2016 22:30:45 +0000 (22:30 +0000)

Trivial merge