Merge branch 'master' into develop

This commit is contained in:
Mark Haines 2015-01-06 19:48:53 +00:00
commit 5cf45c4319
2 changed files with 2 additions and 1 deletions

View file

@ -139,6 +139,7 @@ class BaseMediaResource(Resource):
@download.addBoth
def callback(media_info):
del self.downloads[key]
return media_info
return download
@defer.inlineCallbacks