Merge "Delete docs/upload.txt"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 31 Aug 2013 13:05:41 +0000 (13:05 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 31 Aug 2013 13:05:41 +0000 (13:05 +0000)

Trivial merge