Merge branch 'master' of gitorious.org:electrum/server
authorThomasV <thomasv@gitorious>
Sat, 24 Mar 2012 20:55:56 +0000 (23:55 +0300)
committerThomasV <thomasv@gitorious>
Sat, 24 Mar 2012 20:55:56 +0000 (23:55 +0300)

Trivial merge