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)
commit35704248ae79667342e68084d8c18915b85472e9
tree54aca37c40fbc83eab6f59535a8c0f0847c61f80
parentd881ad5558ebe1ed8c308ffc3e522541ff22664f
parent6a4b8043d45011c195031d57629af407e62bfa98
Merge changes I69557b09,I9bd0b280

* changes:
  Prevent blocked users from changing user rights through the API
  Add dieBlocked to APIBase and make use of it