Merge "ApiLogin: Don't try to add block info if there's no block"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 2 Sep 2015 14:23:14 +0000 (14:23 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 2 Sep 2015 14:23:14 +0000 (14:23 +0000)

Trivial merge