Merge "Special:Upload Fire wikipage.content hook"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 26 Oct 2015 12:32:57 +0000 (12:32 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 26 Oct 2015 12:32:57 +0000 (12:32 +0000)

Trivial merge