From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 15 Sep 2014 21:36:21 +0000 (+0200)
Subject: Merge remote-tracking branch '5moufl/behindkink'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=fc96eb4e2180d9a2371d84daa4305a5f34f12321

Merge remote-tracking branch '5moufl/behindkink'
---

fc96eb4e2180d9a2371d84daa4305a5f34f12321