From: remitamine <remitamine@gmail.com>
Date: Wed, 23 Dec 2015 20:50:27 +0000 (+0100)
Subject: Merge branch 'theintercept' of https://github.com/bit/youtube-dl into bit-theintercept
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=c153bd8b2fffa0b8c8fa4501b242becffe70be4e;p=youtube-dl

Merge branch 'theintercept' of https://github.com/bit/youtube-dl into bit-theintercept
---

c153bd8b2fffa0b8c8fa4501b242becffe70be4e