Merge "Match salt of WatchAction::show() and getWatchToken()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 9 Aug 2015 03:27:50 +0000 (03:27 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 9 Aug 2015 03:27:50 +0000 (03:27 +0000)

Trivial merge