Merge remote-tracking branch 'origin/master' into fork_master

New tests - merged with md5 correction

1 files changed, 0 insertions, 6 deletions

diff --git a/__main__.py b/__main__.py
deleted file mode 100755
index fc3cc8ad8..000000000
--- a/__main__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env python
-
-import youtube_dl
-
-if __name__ == '__main__':
-    youtube_dl.main()