From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 9 Nov 2014 07:30:12 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=8bb9b97c97d7114dbbc3f7b602130e82d2cfd16f;p=youtube-dl

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

8bb9b97c97d7114dbbc3f7b602130e82d2cfd16f