From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 23 Jan 2015 00:32:52 +0000 (+0100)
Subject: Merge remote-tracking branch 'derrotebaron/master'
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=ba655a0e4c0a80bc45d648e56ec3eb5777d599ac;p=youtube-dl

Merge remote-tracking branch 'derrotebaron/master'
---

ba655a0e4c0a80bc45d648e56ec3eb5777d599ac