Merge branch 'master' of github.com:spesmilo/electrum-server
authorThomasV <thomasv@gitorious>
Sat, 27 Oct 2012 08:40:38 +0000 (12:40 +0400)
committerThomasV <thomasv@gitorious>
Sat, 27 Oct 2012 08:40:38 +0000 (12:40 +0400)
commit0bca91daacd91744f4167d7cfe88ef71dfeef30b
tree0446d0c2f6b2696fb5f6591e7284d93bded21124
parentd33b5fc4c2d7c039a28b92814903acd61999497e
parentef021450a2a9ddbd808d89d3a3e04c9c91d08e7d
Merge branch 'master' of github.com:spesmilo/electrum-server