From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 27 Sep 2012 17:24:41 +0000 (+0200)
Subject: Merge remote-tracking branch 'FiloSottille/supports'
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=7f36e396768722319b4036b845cd9a105b60bd5b;p=youtube-dl

Merge remote-tracking branch 'FiloSottille/supports'

Conflicts:
	youtube-dl
---

7f36e396768722319b4036b845cd9a105b60bd5b