From: Philipp Hagemeister <phihag@phihag.de>
Date: Wed, 7 Jan 2015 06:30:57 +0000 (+0100)
Subject: Merge commit '8ee3415'
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=e4a8eae701f22395dae607ed000d39f7a57e80a0;p=youtube-dl

Merge commit '8ee3415'
---

e4a8eae701f22395dae607ed000d39f7a57e80a0