Merge "Better error message via api when content model does not allow editing"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 1 Jul 2015 13:56:38 +0000 (13:56 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 1 Jul 2015 13:56:38 +0000 (13:56 +0000)

Trivial merge