Show OP_RETURN in tx dialogue
Merge pull request #824 from dabura667/txdiagopret

Show op_return in tx dialogue
better fees estimates
fix fee_e in settings window
fix bug #787
Merge branch 'master' of git://github.com/spesmilo/electrum
labels: pull in separate thread. also fix error messages
Merge branch 'master' of git://github.com/spesmilo/electrum
fix printing of unicode values
Merge branch 'master' of git://github.com/spesmilo/electrum
don't encrypt keys, because it creates new items everytime
labels: encrypt keys with deterministic iv
iv should be different from password
fix: add missing imports
add missing import
fix export addresses
fix restore from mpk command line
Merge branch 'master' of git://github.com/spesmilo/electrum
don't change fee if it is fixed by user
call set_language before QApplication. fixes #400