Merge branch 'master' of github.com:spesmilo/electrum-server
authorThomasV <thomasv@gitorious>
Tue, 4 Mar 2014 19:51:20 +0000 (23:51 +0400)
committerThomasV <thomasv@gitorious>
Tue, 4 Mar 2014 19:51:20 +0000 (23:51 +0400)

Trivial merge