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)
commit324916d11a891f727c96aab94172a4fab4b8950a
tree53bf9ce6dbbaefe34d73fab45bffee369033dc07
parent3ccb0655c1f27953ba00ee3f8bc290ca9bfda7ce
parentce5879fa1475d9b0a74bd4e644ea944083177b2d
Merge branch 'gamekings_fix' of https://github.com/rrooij/youtube-dl into rrooij-gamekings_fix