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

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

7d48c06f27fba7287c6c548e930f90f3aebac07a