Merge branch 'master' of git://gitorious.org/electrum/electrum
authorthomasv <thomasv@gitorious>
Tue, 6 Dec 2011 15:32:48 +0000 (16:32 +0100)
committerthomasv <thomasv@gitorious>
Tue, 6 Dec 2011 15:32:48 +0000 (16:32 +0100)

Trivial merge