Merge "Add frontend API for uploading via iframe"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 13 Jul 2015 17:50:15 +0000 (17:50 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 13 Jul 2015 17:50:15 +0000 (17:50 +0000)

Trivial merge