From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 27 Jun 2013 15:52:41 +0000 (+0200)
Subject: Merge remote-tracking branch 'JohnyMoSwag/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=b8f7b1579a61e52fd9dcb4920d919ed732083924;hp=-c;p=youtube-dl

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

b8f7b1579a61e52fd9dcb4920d919ed732083924