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)

Trivial merge