Merge branch 'master' of gitorious.org:electrum/electrum
authorThomasV <thomasv@gitorious>
Thu, 10 May 2012 09:10:51 +0000 (13:10 +0400)
committerThomasV <thomasv@gitorious>
Thu, 10 May 2012 09:10:51 +0000 (13:10 +0400)

Trivial merge