Merge branch 'master' of github.com:spesmilo/electrum-server
authorThomasV <thomasv@gitorious>
Wed, 30 Jan 2013 19:41:14 +0000 (23:41 +0400)
committerThomasV <thomasv@gitorious>
Wed, 30 Jan 2013 19:41:14 +0000 (23:41 +0400)

Trivial merge