From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 23 Jan 2015 17:58:28 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=5779b3e1fe4dd76972d3c00bb12cc1131765d0c1;p=youtube-dl

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

5779b3e1fe4dd76972d3c00bb12cc1131765d0c1