GUI: emit textEdited signal when setting amount in URI
fix get_private_key_from_xpubkey
fixes for plugin integration
optimized, cleaned up, commented
Merge branch 'master' of https://github.com/spesmilo/electrum into showaccount
Added searchcontacts command
add missing electrum_gui.qt.qrwindow to setup.py
Merge pull request #915 from nomnombtc/master

add missing electrum_gui.qt.qrwindow to setup.py
Merge pull request #916 from Tafelpoot/optimize

Optimized transaction.py a bit more
require python 2.7 from now
Merge pull request #914 from naleves/searchcontacts

Added searchcontacts command
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/transaction.py
	setup.py