Merge branch 'master' of https://github.com/spesmilo/electrum
authorMaran <maran.hidskes@gmail.com>
Fri, 15 Mar 2013 15:52:57 +0000 (16:52 +0100)
committerMaran <maran.hidskes@gmail.com>
Fri, 15 Mar 2013 15:52:57 +0000 (16:52 +0100)

Trivial merge