From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 13 May 2014 08:09:04 +0000 (+0200)
Subject: Merge remote-tracking branch 'hojel/hentaistigma'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=24e6ec8ac862267b100539fbe745ec87015bbc3d

Merge remote-tracking branch 'hojel/hentaistigma'
---

24e6ec8ac862267b100539fbe745ec87015bbc3d