Merge branch 'gamekings_fix' of https://github.com/rrooij/youtube-dl into rrooij...
authorYen Chi Hsuan <yan12125@gmail.com>
Sun, 31 Jan 2016 18:11:25 +0000 (02:11 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Sun, 31 Jan 2016 18:11:25 +0000 (02:11 +0800)

Trivial merge