Merge branch 'master' of https://github.com/aurium/youtube-dl into aurium-master
authorSergey M․ <dstftw@gmail.com>
Sat, 11 Jul 2015 15:58:12 +0000 (21:58 +0600)
committerSergey M․ <dstftw@gmail.com>
Sat, 11 Jul 2015 15:58:12 +0000 (21:58 +0600)
commitac9ed061ec08ad360a0422ddb68060bdcc72baa2
tree61cabec165c6a9438bc1c66905c7e66dfc1ef265
parentd919fa3344463f94a152a10ba65981cd290d9ec8
parentaa5d9a79d6b5c354ee4a6bfbb43f94c2485ab9b4
Merge branch 'master' of https://github.com/aurium/youtube-dl into aurium-master
README.md
youtube_dl/YoutubeDL.py
youtube_dl/__init__.py
youtube_dl/options.py
youtube_dl/postprocessor/ffmpeg.py