From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 17 Feb 2015 22:41:48 +0000 (+0100)
Subject: Merge branch 'progress-as-hook2'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=09ab40b7d1d1838aaf0ad2086e691a0d68e165f1

Merge branch 'progress-as-hook2'
---

09ab40b7d1d1838aaf0ad2086e691a0d68e165f1