From: Sergey M․ <dstftw@gmail.com>
Date: Fri, 12 Jun 2015 11:49:07 +0000 (+0600)
Subject: Merge branch 'hlintala-5tv'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=e5095f1198f9f7a7f01a6692bcdee0e92f577dd5

Merge branch 'hlintala-5tv'
---

e5095f1198f9f7a7f01a6692bcdee0e92f577dd5