Merge branch 'master' into extract_info_rewrite

[youtube-dl] / youtube-dl

diff --git a/youtube-dl b/youtube-dl
index a7c5ee6f942b4b0770c17fccfa333fdd487a2ed7..e6f05c17327ed58f8db66e6dc7d2a38380355d61 100755 (executable)
Binary files a/youtube-dl and b/youtube-dl differ