From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 22 Jul 2014 14:59:31 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=5198bf68fc970f87be266e10ed5a05e67037c7b1

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

5198bf68fc970f87be266e10ed5a05e67037c7b1