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
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
Exchange Rate History - Add APIs

Add API for Winkdex and BitcoinVenezuela
update bip32 derivations, using xpriv and xpub serialization format
update bip32 derivations, using xpriv and xpub serialization format
update bip32 derivations, using xpriv and xpub serialization format
Merge pull request #638 from wozz/exchange-hist-ven

Exchange Rate History - Add APIs
Merge branch 'master' of git://github.com/spesmilo/electrum
Added Bitcurex and Bitmarket exchanges
Update create current unix time

update method to create current unix time to be windows compatible

fix issue #640
Merge pull request #641 from wozz/640

Update create current unix time
Merge pull request #639 from toomyem/spesmilo

Added Bitcurex and Bitmarket exchanges