Merge branch 'fix_douyu' of https://github.com/yan12125/youtube-dl
authorSergey M․ <dstftw@gmail.com>
Wed, 1 Apr 2015 13:54:00 +0000 (19:54 +0600)
committerSergey M․ <dstftw@gmail.com>
Wed, 1 Apr 2015 13:54:00 +0000 (19:54 +0600)

Trivial merge