Merge "Revert "Clean up user handling in UploadStash""
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 11 Sep 2016 00:35:32 +0000 (00:35 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 11 Sep 2016 00:35:32 +0000 (00:35 +0000)
1  2 
includes/upload/UploadStash.php

Simple merge