Merge "Remove use of deprecated User::EDIT_TOKEN_SUFFIX"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 3 Apr 2016 10:45:16 +0000 (10:45 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 3 Apr 2016 10:45:16 +0000 (10:45 +0000)

Trivial merge