Merge "Inserted test whether the resource 'uploadsource' is already registered. Bug...
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 21 May 2014 09:31:41 +0000 (09:31 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 21 May 2014 09:31:41 +0000 (09:31 +0000)

Trivial merge