Merge branch 'progress-as-hook2'
authorPhilipp Hagemeister <phihag@phihag.de>
Tue, 17 Feb 2015 22:41:48 +0000 (23:41 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Tue, 17 Feb 2015 22:41:48 +0000 (23:41 +0100)
1  2 
youtube_dl/downloader/http.py

Simple merge