Merge "Add a bailout method for getEditToken"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 15 Jul 2015 21:18:56 +0000 (21:18 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 15 Jul 2015 21:18:56 +0000 (21:18 +0000)

Trivial merge