new file:   LICENSE
	new file:   MANIFEST
	new file:   mmgen-addrgen
	new file:   mmgen-keygen
	new file:   mmgen-passchg
	new file:   mmgen-walletchk
	new file:   mmgen-walletgen
	new file:   mmgen/Opts.py
	new file:   mmgen/__init__.py
	new file:   mmgen/addr.py
	new file:   mmgen/bitcoin.py
	new file:   mmgen/config.py
	new file:   mmgen/license.py
	new file:   mmgen/mn_electrum.py
	new file:   mmgen/mn_tirosh.py
	new file:   mmgen/mnemonic.py
	new file:   mmgen/utils.py
	new file:   mmgen/walletgen.py
	new file:   setup.py
	new file:   tests/addr.py
	new file:   tests/bitcoin.py
	new file:   tests/mn_electrum.py
	new file:   tests/mn_tirosh.py
	new file:   tests/mnemonic.py
	new file:   tests/test.py
	new file:   tests/utils.py
	new file:   tests/walletgen.py
	new file:   wordlists/mn_wordlist.c
	new file:   wordlists/mn_wordlist.py
	new file:   wordlists/mn_wordlist.sort.py
	new file:   wordlists/mnemonic.py
	new file:   wordlists/mnemonic.sort.py
Merge branch 'master' of https://github.com/mmgen/mmgen

Conflicts:
	LICENSE

	deleted:    LICENSE
	new file:   README.md