From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 28 Jan 2014 20:46:42 +0000 (+0100)
Subject: Merge remote-tracking branch 'dstftw/channel9'
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=6490306017cc51eaf21eef855f0db008f69ce733;p=youtube-dl.git

Merge remote-tracking branch 'dstftw/channel9'
---

6490306017cc51eaf21eef855f0db008f69ce733