Merge "Add more detailed upload stash error messages"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 29 Oct 2014 17:40:53 +0000 (17:40 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 29 Oct 2014 17:40:53 +0000 (17:40 +0000)
1  2 
includes/api/ApiUpload.php
languages/i18n/qqq.json

Simple merge
Simple merge