From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 14 Oct 2013 23:26:34 +0000 (+0200)
Subject: Merge remote-tracking branch 'Elbandi/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=3ddf1a6d01f73ca5a1c8320a5e0f51b9ab976e8c;hp=-c;p=youtube-dl

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

3ddf1a6d01f73ca5a1c8320a5e0f51b9ab976e8c