From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 22 Jan 2015 23:06:02 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=3ee2aa7a165670ac6f0a22fe8a3aeda64727aebb;p=youtube-dl

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

3ee2aa7a165670ac6f0a22fe8a3aeda64727aebb