Merge branch 'master' of github.com:spesmilo/electrum-server
authorThomasV <thomasv@gitorious>
Fri, 26 Apr 2013 10:00:57 +0000 (14:00 +0400)
committerThomasV <thomasv@gitorious>
Fri, 26 Apr 2013 10:00:57 +0000 (14:00 +0400)

Trivial merge