Merge branch 'master' of https://github.com/spesmilo/electrum
authorJimbo77 <onlineregular@gmail.com>
Wed, 22 Aug 2012 19:25:47 +0000 (12:25 -0700)
committerJimbo77 <onlineregular@gmail.com>
Wed, 22 Aug 2012 19:25:47 +0000 (12:25 -0700)

Trivial merge