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

commit 60e1fe00799357145e1d43efc1a1548a8d9abb11
parent ce3bfe5d57e51b3f9f47cbd04d1733f12e85ce9d
Author: Sergey M․ <dstftw@gmail.com>
Date:   Wed,  1 Apr 2015 20:25:11 +0600

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