Merge "Fix strict error in UploadStashFile"
authorIAlex <ialex.wiki@gmail.com>
Sun, 16 Sep 2012 17:48:20 +0000 (17:48 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 16 Sep 2012 17:48:20 +0000 (17:48 +0000)

Trivial merge