Merging from default
Merging from default

changeset:   3659:2264bffd89ca
parent:      3652:d5c3f2d98f46
user:        Mike Shal <mshal@mozilla.com>
date:        Tue Feb 17 14:42:27 2015 -0500
summary:     Bug 1132291 - Don't die if uploadFiles isn't set; r=jlund

--HG--
branch : production

mozilla/build-mozharness,mozilla/build-mozharness