From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 21 Apr 2014 00:48:04 +0000 (+0200)
Subject: Merge remote-tracking branch 'kwbr/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=117a7d194432788435d9a2e697378c8bfc9a640d

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

117a7d194432788435d9a2e697378c8bfc9a640d