From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Mon, 15 Jun 2015 16:20:52 +0000 (+0800)
Subject: Merge branch 'PeterDing-youku'
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=79fe954d79c756f6243036e4927595c43ffaa5b7;p=youtube-dl

Merge branch 'PeterDing-youku'
---

79fe954d79c756f6243036e4927595c43ffaa5b7