handle timeout in peers script
Merge branch 'master' of git://github.com/spesmilo/electrum
Merge pull request #623 from dpdtex/master

Add ability to specify fiat amount when sending bitcoin
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)
Merge pull request #7 from spesmilo/master

reset fork for dpdtex