From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 29 Apr 2014 23:37:05 +0000 (+0200)
Subject: Merge remote-tracking branch 'pulpe/moviezinese'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=29645a1d4471d527ab6ff5fc3c36d52ae2c8c6ea;p=youtube-dl

Merge remote-tracking branch 'pulpe/moviezinese'
---

29645a1d4471d527ab6ff5fc3c36d52ae2c8c6ea