Merge branch 'master' of github.com:spesmilo/electrum-server
authorThomasV <thomasv@gitorious>
Thu, 14 Nov 2013 17:02:46 +0000 (21:02 +0400)
committerThomasV <thomasv@gitorious>
Thu, 14 Nov 2013 17:02:46 +0000 (21:02 +0400)

Trivial merge