Merge "Make protect.php maintenance script not ignore --user and --reason parameters"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 30 Nov 2016 00:05:06 +0000 (00:05 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 30 Nov 2016 00:05:06 +0000 (00:05 +0000)

Trivial merge