diff options
author | Charles Chen <chaochichen@gmail.com> | 2014-07-22 14:44:38 -0700 |
---|---|---|
committer | Charles Chen <chaochichen@gmail.com> | 2014-07-22 14:44:38 -0700 |
commit | c4f731262dbee921147b94aac5035b5d9ec75502 (patch) | |
tree | 98a93f1de2b7c71a8e25fa072515b4efc5f43ea1 /youtube_dl/extractor/chilloutzone.py | |
parent | 07cc63f386c6afe253b7707631663072d2fb8789 (diff) | |
parent | e42a692f003eabdb1efad7b9f4b10ce97c712d32 (diff) |
Merge remote-tracking branch 'upstream/master' into MLB
Conflicts:
youtube_dl/extractor/mlb.py
Diffstat (limited to 'youtube_dl/extractor/chilloutzone.py')
-rw-r--r-- | youtube_dl/extractor/chilloutzone.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/extractor/chilloutzone.py b/youtube_dl/extractor/chilloutzone.py index 02d5ba527..a62395d4b 100644 --- a/youtube_dl/extractor/chilloutzone.py +++ b/youtube_dl/extractor/chilloutzone.py @@ -42,7 +42,7 @@ class ChilloutzoneIE(InfoExtractor): 'id': '85523671', 'ext': 'mp4', 'title': 'The Sunday Times - Icons', - 'description': 'md5:3e1c0dc6047498d6728dcdaad0891762', + 'description': 'md5:a5f7ff82e2f7a9ed77473fe666954e84', 'uploader': 'Us', 'uploader_id': 'usfilms', 'upload_date': '20140131' |