From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 4 Oct 2013 09:14:20 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=c0f6aa876ff3fc2fafe81e2f2cdd323e789559e0;p=youtube-dl

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

c0f6aa876ff3fc2fafe81e2f2cdd323e789559e0