Merge "mw.ForeignStructuredUpload: Prevent categories and descriptions from being...
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 5 Nov 2015 19:00:47 +0000 (19:00 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 5 Nov 2015 19:00:47 +0000 (19:00 +0000)

Trivial merge