From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 23 Sep 2013 09:24:49 +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=92f618f2e22964d9b89781fd66164d6a02038111

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

92f618f2e22964d9b89781fd66164d6a02038111