From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 24 Aug 2014 05:14:23 +0000 (+0200)
Subject: Merge remote-tracking branch 'riking/twofactor'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=9480d1a56674f95f135562d2133cbf12f6a96bbc

Merge remote-tracking branch 'riking/twofactor'
---

9480d1a56674f95f135562d2133cbf12f6a96bbc