Merge branch 'master' of gitorious.org:electrum/electrum
authorThomasV <thomasv@gitorious>
Fri, 11 Nov 2011 10:32:54 +0000 (11:32 +0100)
committerThomasV <thomasv@gitorious>
Fri, 11 Nov 2011 10:32:54 +0000 (11:32 +0100)
commitf56622137e5c3214207d3662e64ff5e4c99e1ff7
tree3740c1759bddae3e53d9e42e65fca11cf8186a69
parente20c7bb083a323fb8655414a5d89fcde1f76f215
parentc874890908779022d0b6a85f263f6373338a7738
Merge branch 'master' of gitorious.org:electrum/electrum