Merge branch 'youku' of https://github.com/PeterDing/youtube-dl into PeterDing-youku
authorYen Chi Hsuan <yan12125@gmail.com>
Mon, 15 Jun 2015 14:36:44 +0000 (22:36 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Mon, 15 Jun 2015 14:36:44 +0000 (22:36 +0800)

Trivial merge