Merge branch 'master' of github.com:spesmilo/electrum
authorthomasv <thomasv@gitorious>
Mon, 17 Dec 2012 15:21:53 +0000 (16:21 +0100)
committerthomasv <thomasv@gitorious>
Mon, 17 Dec 2012 15:21:53 +0000 (16:21 +0100)

Trivial merge