From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 11 Jul 2014 09:00:37 +0000 (+0200)
Subject: Merge remote-tracking branch 'MikeCol/goshgay'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=6f66eedc5dc84ac72b36722771ec625f4ccecef7

Merge remote-tracking branch 'MikeCol/goshgay'
---

6f66eedc5dc84ac72b36722771ec625f4ccecef7