From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 25 Sep 2014 00:03:49 +0000 (+0200)
Subject: Merge remote-tracking branch 'naglis/wistia'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=c6e90caaa661e8368f099055c609c7c121bbbc2b

Merge remote-tracking branch 'naglis/wistia'
---

c6e90caaa661e8368f099055c609c7c121bbbc2b