Merge branch 'master' of github.com:spesmilo/electrum-server
authorThomasV <thomasv@gitorious>
Sun, 28 Apr 2013 05:53:58 +0000 (09:53 +0400)
committerThomasV <thomasv@gitorious>
Sun, 28 Apr 2013 05:53:58 +0000 (09:53 +0400)

Trivial merge