Merge changes I69557b09,I9bd0b280
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 23 Dec 2015 10:17:41 +0000 (10:17 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 23 Dec 2015 10:17:41 +0000 (10:17 +0000)
* changes:
  Prevent blocked users from changing user rights through the API
  Add dieBlocked to APIBase and make use of it


Trivial merge