Merge branch 'charlierose' of https://github.com/TRox1972/youtube-dl into TRox1972...
authorYen Chi Hsuan <yan12125@gmail.com>
Sun, 21 Aug 2016 16:48:35 +0000 (00:48 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Sun, 21 Aug 2016 16:48:35 +0000 (00:48 +0800)

Trivial merge