Merge branch 'master' of github.com:spesmilo/electrum-server
authorThomasV <thomasv@gitorious>
Fri, 6 Dec 2013 10:12:43 +0000 (14:12 +0400)
committerThomasV <thomasv@gitorious>
Fri, 6 Dec 2013 10:12:43 +0000 (14:12 +0400)
commit5bbcbea8ce9f9344dffef8a1204c6429ce1166aa
tree037d9c8c46c3deb0b6d3f501f30275e94184e16d
parent4df3953a9bb15d1a81078e0dbe49b823aa9d4917
parentd9a0afacc92c535eb8436857635eea196d7758ee
Merge branch 'master' of github.com:spesmilo/electrum-server