Merge branch '1.9' of git://github.com/spesmilo/electrum into 1.9
authorthomasv <thomasv@gitorious>
Tue, 27 Aug 2013 11:59:20 +0000 (13:59 +0200)
committerthomasv <thomasv@gitorious>
Tue, 27 Aug 2013 11:59:20 +0000 (13:59 +0200)

Trivial merge