Merge branch 'master' of gitorious.org:electrum/electrum
authorthomasv <thomasv@gitorious>
Mon, 14 May 2012 11:35:47 +0000 (13:35 +0200)
committerthomasv <thomasv@gitorious>
Mon, 14 May 2012 11:35:47 +0000 (13:35 +0200)

Trivial merge