fixed title on 3 dialog boxes (they were showing "python" as title)
add white space before BTC frozen message

Added a white space before BTC in the not enough funds frozen message.

The ‘Not enough funds…’ message does not disappear even after clicking
the clear button. Only changing the amount to send restores the
‘Balance’ message
Merge pull request #628 from rdymac/are-frozen

add white space before BTC frozen message
Merge pull request #625 from dpdtex/DialogTitles

fixed title on 3 dialog boxes (they were showing "python" as title)
Fixed size issue on account combo box in status panel. If you started Electrum with a wallet that did not have imported keys (therefore the account combo box didn't show), then you opened a wallet that had imported keys, the combo box was not wide enough to correctly display the combo box items.
Merge pull request #632 from dpdtex/FixAccountComboWidth

Fixed bug with width of account combo box on bottom right.
Cleaned up Exchange Rate plugin: more efficient code and more intuitive names for the get fiat balance/price procedures.  Created new procedure used for updating the fiat balance & price on the status panel.  Enhancement: status panel on bottom left now shows the current BTC price (eg, 1 BTC~573.45 USD).
Streamlined code - modified two procs (get_fiat_status_text and fiat_dialog) to call exchange API only once instead of twice (as recommended by wozz).
Merge pull request #634 from dpdtex/FiatPrice

Show Current Fiat Price in Status Panel
Fixes to merchant.py

Correct order of arguments to create_watching_only_wallet and correct
usage of sqlite3
Merge branch 'master' of github.com:spesmilo/electrum into clean
better waiting dialog, with Qt signals
remove redundant definition of Timer class
Merge pull request #631 from jisqyv/jischanges

Updates for merchant.py
add error field in tx, because exceptions cannot be passed by plugins
Merge branch 'master' of github.com:spesmilo/electrum into clean