Merge branch 'master' into extract_info_rewrite

[youtube-dl] / youtube-dl

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