Merge branch 'master' of github.com:spesmilo/electrum-server
authorThomasV <thomasv@gitorious>
Fri, 6 Dec 2013 10:12:43 +0000 (14:12 +0400)
committerThomasV <thomasv@gitorious>
Fri, 6 Dec 2013 10:12:43 +0000 (14:12 +0400)

Trivial merge