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

commit 59f197aec1699d51078c69df7f8c34874e444caf
parent a0e5beb0fbfa5f300087c18b12ff67fade51d578
Author: remitamine <remitamine@gmail.com>
Date:   Thu, 31 Dec 2015 22:15:14 +0100

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

	youtube-dl Another place where youtube-dl lives on
	git clone git://git.oshgnacknak.de/youtube-dl.git
	Log \| Files \| Refs \| README \| LICENSE