From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 26 Aug 2013 19:29:44 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=c3b7b29c23668f5e7e496ec50693a2e1620789b1;p=youtube-dl

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

c3b7b29c23668f5e7e496ec50693a2e1620789b1