Merge branch 'master' of gitorious.org:electrum/server
authorThomasV <thomasv@gitorious>
Mon, 26 Mar 2012 09:42:36 +0000 (13:42 +0400)
committerThomasV <thomasv@gitorious>
Mon, 26 Mar 2012 09:42:36 +0000 (13:42 +0400)

Trivial merge