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)
commit8268e94cd424e010466206a77087b5c366db8cc7
tree86455c8cfc761ec0e5cf621ff6f8a7eb75c4e621
parent4af98ecdfb896c16e73cb9f7306908cc686782e8
parent08f7db20c16743a2bd3040eb7dac11d675011eef
Merge branch 'youku' of https://github.com/PeterDing/youtube-dl into PeterDing-youku