Merge branch 'master' of github.com:spesmilo/electrum-server
authorThomasV <thomasv@gitorious>
Fri, 16 Nov 2012 13:49:20 +0000 (17:49 +0400)
committerThomasV <thomasv@gitorious>
Fri, 16 Nov 2012 13:49:20 +0000 (17:49 +0400)
commitb5512e97107b535006fb63ecba7c9b31f2a2e75b
treed94cc0537c1b0d281bca0cfa634c3979217ff57e
parent2d47ce381274578dfa52c6042bb7e0c433518fbf
parentecef9cdc50eb74eb729371dcfb139382113cf868
Merge branch 'master' of github.com:spesmilo/electrum-server