Merge branch 'master' of https://github.com/spesmilo/electrum
authorMaran <maran.hidskes@gmail.com>
Sun, 17 Mar 2013 12:15:47 +0000 (13:15 +0100)
committerMaran <maran.hidskes@gmail.com>
Sun, 17 Mar 2013 12:15:47 +0000 (13:15 +0100)

Trivial merge