From: Philipp Hagemeister <phihag@phihag.de>
Date: Wed, 18 Feb 2015 23:01:14 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=d61aefb24c96d8b45aed63cfdcfec0c157a24ba5;p=youtube-dl

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

d61aefb24c96d8b45aed63cfdcfec0c157a24ba5