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

Trivial merge