Merge branch 'patch-1' of https://github.com/tuexss/youtube-dl into tuexss-patch-1
authorSergey M․ <dstftw@gmail.com>
Sat, 4 Apr 2015 13:50:47 +0000 (19:50 +0600)
committerSergey M․ <dstftw@gmail.com>
Sat, 4 Apr 2015 13:50:47 +0000 (19:50 +0600)
1  2 
youtube_dl/options.py

Simple merge