From: Philipp Hagemeister <phihag@phihag.de>
Date: Wed, 28 Aug 2013 12:02:40 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=ccf4b799df0f97df5f745f38af96666386766754;hp=-c;p=youtube-dl

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

ccf4b799df0f97df5f745f38af96666386766754