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

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

a1c68b9ef2650099989c786499debf4923d4a626