Merge "Check $wgCheckFileExtensions on client side on Special:Upload"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 12 Jan 2015 20:02:56 +0000 (20:02 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 12 Jan 2015 20:02:56 +0000 (20:02 +0000)

Trivial merge