From: remitamine <remitamine@gmail.com>
Date: Tue, 26 Jan 2016 14:55:38 +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=ab180fc648d331643aaf340c3cf7e92bcbb10bce;p=youtube-dl.git

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

ab180fc648d331643aaf340c3cf7e92bcbb10bce