From: ecdsa <ecdsa@github>
Date: Sun, 17 Mar 2013 18:09:06 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/spesmilo/electrum
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=87b94b3ccc4180a84e1f309ead65abd37eae3a9f;p=electrum-nvc.git

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

87b94b3ccc4180a84e1f309ead65abd37eae3a9f