Merge branch 'master' of github.com:spesmilo/electrum-server
authorThomasV <thomasv@gitorious>
Mon, 5 Nov 2012 19:03:17 +0000 (23:03 +0400)
committerThomasV <thomasv@gitorious>
Mon, 5 Nov 2012 19:03:17 +0000 (23:03 +0400)

Trivial merge