add switch-gui button for qt
Merge branch 'master' into qt-switch-gui
add confirmations to history checkmark tooltips
Merge pull request #86 from bkkcoins/confirmation-tooltips

Add confirmation count to history line checkmark tooltips
import/export functions
use the same syntax as bitcoind for key import
test password before importing key
fix: return early on cancel
add warning to help message
don't ask pw if wallet is unencrypted
delete imported key in gui
convert address to str in sign_message; update tabs after import
improve layout for sign/verify message
fix: toPlainText()
bump version number
Draft release notes for 1.6.0
warning against key import
Merge branch 'master' of git://github.com/spesmilo/electrum
fix bug with undetected incorrect password that can damage wallet
update release notes for 1.6.0