From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 25 Jul 2013 07:34:56 +0000 (+0200)
Subject: Merge remote-tracking branch 'pishposhmcgee/patch-2'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=09eeb75130bf703cd5a84f99634b86589ec7159e;hp=-c;p=youtube-dl

Merge remote-tracking branch 'pishposhmcgee/patch-2'
---

09eeb75130bf703cd5a84f99634b86589ec7159e