From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 31 Aug 2014 22:17:01 +0000 (+0200)
Subject: Merge remote-tracking branch 'naglis/tudou_fix'
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=329818484ce44229835f4b2b02006120b0d81bcf;p=youtube-dl.git

Merge remote-tracking branch 'naglis/tudou_fix'
---

329818484ce44229835f4b2b02006120b0d81bcf