Merge branch 'master' of github.com:spesmilo/electrum
authorthomasv <thomasv@gitorious>
Mon, 17 Dec 2012 15:21:53 +0000 (16:21 +0100)
committerthomasv <thomasv@gitorious>
Mon, 17 Dec 2012 15:21:53 +0000 (16:21 +0100)
commit6b7ad42ec55003324ed6971529898af9bf3307a9
tree4e0b301e41df739e2f300895a1d9058160677b09
parent6bd57d4829b127b022946871bf84ad0aabf3fef6
parent5ee708aaa23757a359e3755ddb4f63c322b92cf5
Merge branch 'master' of github.com:spesmilo/electrum