electrum.desktop: Add as protocol handler for bitcoin: URIs.
fix for issue 184
Merge pull request #202 from wozz/184

fix for issue #184
os path join
Merge branch 'master' of git://github.com/spesmilo/electrum
Merge pull request #199 from gebner/master

Register as protocol handler for bitcoin: URIs
don't show change addresses in list
split seed words with newline too
Updated label help text
fix: assert fails on startup
Slightly modifying help output for clarity
Merge pull request #206 from JulianTosh/TuxHelpMods

Slightly modifying help output for clarity
fix: socket error
handle errno 10035
fix: print_log -> print_error
distinction between unconfirmed and unverified transactions
icon cannot be None
use an Event to signal when to redraw the gui
Merge branch 'master' into kivy