Merge branch 'baidu' of https://github.com/remitamine/youtube-dl into remitamine...
authorYen Chi Hsuan <yan12125@gmail.com>
Sat, 2 Jan 2016 13:27:32 +0000 (21:27 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Sat, 2 Jan 2016 13:27:32 +0000 (21:27 +0800)

Trivial merge