From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 3 Mar 2015 12:57:29 +0000 (+0100)
Subject: Merge branch 'cn-verification-proxy'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=938c3f65b6c1c1f5b8f7eb731a3eef00a06b6128;p=youtube-dl

Merge branch 'cn-verification-proxy'
---

938c3f65b6c1c1f5b8f7eb731a3eef00a06b6128