Merge remote-tracking branch 'joelverhagen/master' - youtube-dl

commit 17cb14a33677cd37cd481f8ed7cff37fdab80f9d
parent 877f4c45d3c42045cca9295a92f336e551c7eab8
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Tue, 27 Nov 2012 16:41:16 +0100

Merge remote-tracking branch 'joelverhagen/master'

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