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)

Trivial merge