From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Wed, 8 Jul 2015 17:11:26 +0000 (+0800)
Subject: Merge branch 'ping-yinyuetai'
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=9e535ce055c9b57b6c7fa3c51c6a0928dae2b56d;p=youtube-dl

Merge branch 'ping-yinyuetai'
---

9e535ce055c9b57b6c7fa3c51c6a0928dae2b56d