Merge branch 'master' of git://github.com/spesmilo/electrum
authorThomasV <thomasv@gitorious>
Fri, 4 Oct 2013 15:55:01 +0000 (17:55 +0200)
committerThomasV <thomasv@gitorious>
Fri, 4 Oct 2013 15:55:01 +0000 (17:55 +0200)
commit43002f2ede04404e9907e051c9c89c6d64dfc9da
tree5ec43e3a6c55a74f6228f1baa7e6f2cf570a6c03
parent9a06da1d6b83adb9b12e442e63aaf729a8df1eee
parent5f6de3e0e9abd42f71e7a966201b03453b9c4358
Merge branch 'master' of git://github.com/spesmilo/electrum