From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 13 May 2014 08:11:14 +0000 (+0200)
Subject: Merge remote-tracking branch 'hojel/empflix'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=feb72212091189353c0d6308fa20e4f33cc82da1

Merge remote-tracking branch 'hojel/empflix'
---

feb72212091189353c0d6308fa20e4f33cc82da1