Merge branch 'master' of github.com:Spesmilo/Electrum
authorAmir Taaki <genjix@riseup.net>
Fri, 3 Aug 2012 19:13:49 +0000 (16:13 -0300)
committerAmir Taaki <genjix@riseup.net>
Fri, 3 Aug 2012 19:13:49 +0000 (16:13 -0300)

Trivial merge