Merge branch 'master' of https://github.com/Spesmilo/Electrum
authorMaran <maran.hidskes@gmail.com>
Thu, 2 Aug 2012 20:41:46 +0000 (22:41 +0200)
committerMaran <maran.hidskes@gmail.com>
Thu, 2 Aug 2012 20:41:46 +0000 (22:41 +0200)

Trivial merge