From: remitamine <remitamine@gmail.com>
Date: Fri, 5 Feb 2016 16:20:00 +0000 (+0100)
Subject: Merge branch 'master' of github.com:rg3/youtube-dl
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=86e284e028cef6616260e2da5d5a260b1ef76fa7

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

86e284e028cef6616260e2da5d5a260b1ef76fa7