Merge branch 'master' of gitorious.org:electrum/server
authorThomasV <thomasv@gitorious>
Sat, 24 Mar 2012 21:25:41 +0000 (00:25 +0300)
committerThomasV <thomasv@gitorious>
Sat, 24 Mar 2012 21:25:41 +0000 (00:25 +0300)

Trivial merge