From: remitamine <remitamine@gmail.com>
Date: Wed, 2 Mar 2016 16:35:55 +0000 (+0100)
Subject: Merge branch 'master' of github.com:rg3/youtube-dl
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=e7d20845686e0a35fc386238713ea4bdde89bdcf;p=youtube-dl

Merge branch 'master' of github.com:rg3/youtube-dl
---

e7d20845686e0a35fc386238713ea4bdde89bdcf