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

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

d229ee70da4fbfa25a02c75f02a8c39abadbe970