From: remitamine <remitamine@gmail.com>
Date: Tue, 29 Dec 2015 09:57:45 +0000 (+0100)
Subject: Merge branch 'srgssr' of https://github.com/remitamine/youtube-dl into remitamine... 
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=b19ad2fb53c43c573d22663a739d192509bd8097;p=youtube-dl

Merge branch 'srgssr' of https://github.com/remitamine/youtube-dl into remitamine-srgssr
---

b19ad2fb53c43c573d22663a739d192509bd8097