[options] PEP8 and simpler --merge-output-format handling (#4673)
[youtube-dl] / LICENSE
2013-01-05 Jeff CrouseMerge branch 'master' of https://github.com/rg3/youtube-dl
2012-12-31 Filippo Valsordaaddedd a serious Public Domain dedication, see unlicens...