From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 27 Nov 2012 15:41:16 +0000 (+0100)
Subject: Merge remote-tracking branch 'joelverhagen/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=17cb14a33677cd37cd481f8ed7cff37fdab80f9d

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

17cb14a33677cd37cd481f8ed7cff37fdab80f9d