From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 1 Sep 2014 21:17:27 +0000 (+0200)
Subject: Merge remote-tracking branch 'peugeot/drtuber'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=94388f50b39e750f81e9baeb9fea0354f209d4e9;hp=-c;p=youtube-dl

Merge remote-tracking branch 'peugeot/drtuber'
---

94388f50b39e750f81e9baeb9fea0354f209d4e9