Merge branch 'vlive-hls' of https://github.com/Kagami/youtube-dl into Kagami-vlive-hls
authorYen Chi Hsuan <yan12125@gmail.com>
Fri, 29 Apr 2016 11:26:39 +0000 (19:26 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Fri, 29 Apr 2016 11:26:39 +0000 (19:26 +0800)

Trivial merge