spesmilo/electrum — pull request #587 by slick666 (2014-02-28 17:24:18+00:00)
Title: Merge and coming back around.

"Merged" back from upstreamby just replacing the files that changes with the new changes coming in and then re-worked the changed files to make them more PEP8 compliant.