Merge branch 'viki-shows' of https://github.com/ping/youtube-dl into ping-viki-shows
authorSergey M․ <dstftw@gmail.com>
Sat, 16 May 2015 18:38:58 +0000 (00:38 +0600)
committerSergey M․ <dstftw@gmail.com>
Sat, 16 May 2015 18:38:58 +0000 (00:38 +0600)

Trivial merge