Merge branch 'master' of https://github.com/spesmilo/electrum
authorMaran <maran.hidskes@gmail.com>
Mon, 18 Feb 2013 22:45:06 +0000 (23:45 +0100)
committerMaran <maran.hidskes@gmail.com>
Mon, 18 Feb 2013 22:45:06 +0000 (23:45 +0100)

Trivial merge