tMerge branch 'master' of git://github.com/spesmilo/electrum - electrum - Electrum Bitcoin wallet HTML git clone https://git.parazyd.org/electrum DIR Log DIR Files DIR Refs DIR Submodules --- DIR commit c1d286fc9a27d8b8b28fdbde0f23bbabc4f4886f DIR parent 3863ee9f642514e2960bf808acc3665f13cd7ee6 HTML Author: ThomasV <thomasv@gitorious> Date: Fri, 5 Sep 2014 20:34:00 +0200 Merge branch 'master' of git://github.com/spesmilo/electrum