From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 24 Nov 2014 21:52:04 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=e8c8653e9d5091425f6c8b877d8a6c32a544a6bd;p=youtube-dl

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

e8c8653e9d5091425f6c8b877d8a6c32a544a6bd