Merge branch 'master' into subtitles_rework

This commit is contained in:
Ismael Mejia
2013-08-22 23:29:36 +02:00
44 changed files with 1395 additions and 465 deletions

1
.gitignore vendored
View File

@@ -9,7 +9,6 @@ build/
dist/
MANIFEST
README.txt
README.md
youtube-dl.1
youtube-dl.bash-completion
youtube-dl