Merge commit 'refs/merge-requests/3' of git://gitorious.org/electrum/electrum into...
authorThomasV <thomasv@gitorious>
Sat, 26 Nov 2011 20:47:28 +0000 (23:47 +0300)
committerThomasV <thomasv@gitorious>
Sat, 26 Nov 2011 20:47:28 +0000 (23:47 +0300)

Trivial merge