From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 10 Jan 2015 01:26:21 +0000 (+0100)
Subject: Merge remote-tracking branch 'Tithen-Firion/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=ff21a8e0ee43d4ce0b75cd938f9bdfab664dd579

Merge remote-tracking branch 'Tithen-Firion/master'
---

ff21a8e0ee43d4ce0b75cd938f9bdfab664dd579