Merge branch 'pr/#10268' of https://github.com/lkho/youtube-dl into lkho-pr/#10268
authorYen Chi Hsuan <yan12125@gmail.com>
Thu, 11 Aug 2016 11:03:08 +0000 (19:03 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Thu, 11 Aug 2016 11:03:08 +0000 (19:03 +0800)

Trivial merge