]> git.bitcoin.ninja Git - youtube-dl/commit
Merge remote-tracking branch 'FiloSottille/vbr'
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 27 Sep 2012 18:18:29 +0000 (20:18 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 27 Sep 2012 18:18:29 +0000 (20:18 +0200)
commit234e230c8781ed46013a6a26d56c4b1dcbe57e69
tree711b462a8a59d31fbc830d523a029c021742f8ea
parent34ae0f9d2019c043f86cb31d37ba30fea9c2faf2
parent3a68d7b467d59e6df4d8473989dcd9edb460dd75
Merge remote-tracking branch 'FiloSottille/vbr'

Conflicts:
youtube-dl
youtube-dl.exe
README.md
youtube-dl.1
youtube-dl.bash-completion
youtube_dl/__init__.py