From: Philipp Hagemeister <phihag@phihag.de>
Date: Wed, 31 Aug 2011 19:28:44 +0000 (+0200)
Subject: Merge remote-tracking branch 'wise86/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=802622ac1c76ddd2ede5899a62601c15cf8a18e3;p=youtube-dl

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

802622ac1c76ddd2ede5899a62601c15cf8a18e3