From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 27 Nov 2012 17:48:43 +0000 (+0100)
Subject: Merge remote-tracking branch 'Asido/master'
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=1a9c655e3b1569f315d4193e877cba0b4a863c63;p=youtube-dl

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

1a9c655e3b1569f315d4193e877cba0b4a863c63