Merge "UploadBase: Avoid deprecated wfMemcKey()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 26 May 2017 23:48:29 +0000 (23:48 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 26 May 2017 23:48:30 +0000 (23:48 +0000)

Trivial merge