From: remitamine <remitamine@gmail.com>
Date: Thu, 3 Dec 2015 19:33:22 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master' into bliptv
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=78653a33aa00ba5205940c2baac5d9f019795b88;hp=--cc;p=youtube-dl

Merge remote-tracking branch 'upstream/master' into bliptv
---

78653a33aa00ba5205940c2baac5d9f019795b88