From: ThomasV <thomasv@gitorious>
Date: Mon, 30 Sep 2013 15:43:33 +0000 (+0200)
Subject: Merge branch 'master' of git://github.com/spesmilo/electrum
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=f79d4ee468aaa7d6e6752bdb5a84876d914ba10a;p=electrum-nvc.git

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

f79d4ee468aaa7d6e6752bdb5a84876d914ba10a