From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 10 Jan 2015 19:06:01 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=8a1b9b068ef80c81e68bc87edb5219caa4381652;p=youtube-dl

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

8a1b9b068ef80c81e68bc87edb5219caa4381652