From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 5 Jan 2014 02:16:19 +0000 (+0100)
Subject: Merge remote-tracking branch 'rzhxeo/blip2'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=67c20aebb77ead363fc5386f073cdc64fbd451ce

Merge remote-tracking branch 'rzhxeo/blip2'
---

67c20aebb77ead363fc5386f073cdc64fbd451ce