Merge commit 'refs/merge-requests/2' of git://gitorious.org/electrum/server into...
authorThomasV <thomasv@gitorious>
Sun, 1 Apr 2012 09:31:11 +0000 (13:31 +0400)
committerThomasV <thomasv@gitorious>
Sun, 1 Apr 2012 09:31:11 +0000 (13:31 +0400)

Trivial merge