From: Sergey M․ <dstftw@gmail.com>
Date: Wed, 20 May 2015 14:17:47 +0000 (+0600)
Subject: Merge branch 'viki-shows' of https://github.com/ping/youtube-dl into ping-viki-shows
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=cc7051efd798691773164fc08f4286ff4c0ab317;p=youtube-dl.git

Merge branch 'viki-shows' of https://github.com/ping/youtube-dl into ping-viki-shows
---

cc7051efd798691773164fc08f4286ff4c0ab317