Merge branch 'master' of ssh://github.com/spesmilo/electrum
authorMaran <maran.hidskes@gmail.com>
Mon, 30 Sep 2013 14:21:36 +0000 (16:21 +0200)
committerMaran <maran.hidskes@gmail.com>
Mon, 30 Sep 2013 14:21:36 +0000 (16:21 +0200)

Trivial merge