Merge branch 'youku_bugfix' of https://github.com/Celthi/youtube-dl into Celthi-youku...
authorYen Chi Hsuan <yan12125@gmail.com>
Sat, 12 Dec 2015 06:36:29 +0000 (14:36 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Sat, 12 Dec 2015 06:36:29 +0000 (14:36 +0800)

Trivial merge