From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 30 Jan 2015 02:12:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'bastik/dev-dctp'
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=cf8d6ec865d62ae4bd45f59145adab04776ab2a1;p=youtube-dl

Merge remote-tracking branch 'bastik/dev-dctp'
---

cf8d6ec865d62ae4bd45f59145adab04776ab2a1