From: ThomasV <thomasv@gitorious>
Date: Sun, 16 Mar 2014 19:24:10 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/spesmilo/electrum
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=25ccd2541ad774fef89eb3cd67169bffbdc9bd7c;p=electrum-nvc.git

Merge branch 'master' of git://github.com/spesmilo/electrum
---

25ccd2541ad774fef89eb3cd67169bffbdc9bd7c