From: remitamine <remitamine@gmail.com>
Date: Sun, 27 Dec 2015 14:03:13 +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=2db772b9eadb7ef148ff5fd2c9b061d61b07d8d9;p=youtube-dl.git

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

2db772b9eadb7ef148ff5fd2c9b061d61b07d8d9