Conflicts:
	MANIFEST
	mmgen-keygen
	mmgen-txcreate
	mmgen-txsend
	mmgen-txsign
	mmgen/bitcoin.py
	mmgen/tx.py
	mmgen/utils.py
	setup.py
	deleted:    mmgen-addrgen
Conflicts:
	MANIFEST
	mmgen-addrgen
	mmgen-keygen
	mmgen/bitcoin.py
	mmgen/utils.py
	setup.py