Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Rashid Khan 2014-03-06 14:53:25 -07:00
commit fc28bccd65

View file

@ -32,6 +32,10 @@ define(function (require) {
return obj;
};
_.forOwn(orig, function (val, name) {
sinon[method][name] = val;
});
});
afterEach(function () {