From: Philipp Hagemeister <phihag@phihag.de>
Date: Wed, 17 Dec 2014 22:12:38 +0000 (+0100)
Subject: Merge remote-tracking branch 'petrkutalek/dvtv'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=edf41477f0db0ebf3bc1d3d569be494354472a9a

Merge remote-tracking branch 'petrkutalek/dvtv'
---

edf41477f0db0ebf3bc1d3d569be494354472a9a