Merge branch '1.9' of git://github.com/spesmilo/electrum into 1.9
authorthomasv <thomasv@gitorious>
Thu, 29 Aug 2013 15:37:09 +0000 (17:37 +0200)
committerthomasv <thomasv@gitorious>
Thu, 29 Aug 2013 15:37:09 +0000 (17:37 +0200)

Trivial merge