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)
commit151d98130ba29ac7f242c67772d95842317fbe5e
tree28a0840745280afd4c2a67c5bb5b4d3e838cdd4c
parent14638e291511c3305b70dce64e9bd97686e9da93
parentb24d6336a797b99339c12a0aa1b431755e22e8cf
Merge branch 'vlive-hls' of https://github.com/Kagami/youtube-dl into Kagami-vlive-hls