From: remitamine <remitamine@gmail.com>
Date: Thu, 11 Feb 2016 17:13:56 +0000 (+0100)
Subject: Merge branch 'master' of github.com:rg3/youtube-dl
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=fc3810f6d19fd61cdc91549dc9544128a1cf20e7;p=youtube-dl.git

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

fc3810f6d19fd61cdc91549dc9544128a1cf20e7