Merge remote-tracking branch 'r4mos/master' - youtube-dl - Another place where youtube-dl lives on

commit 727a98c3ee98c5112462415bb1abcab227373268
parent 997987d568b49cb3720083d85f120ef634989ba9
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Tue, 16 Sep 2014 23:33:26 +0200

Merge remote-tracking branch 'r4mos/master'

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