From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 6 Sep 2013 08:53:24 +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=98f3da404022c84a04b336368d030366620cd417

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

98f3da404022c84a04b336368d030366620cd417