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

Trivial merge