From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 15 Aug 2014 08:55:54 +0000 (+0200)
Subject: Merge remote-tracking branch 'akirk/ellentv'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=af8322d2f993653dbec5e6ad943f8cc632b901e4

Merge remote-tracking branch 'akirk/ellentv'
---

af8322d2f993653dbec5e6ad943f8cc632b901e4