modified:   sim/paxos.py
Merge branch 'master' of github.com:cutefish/geods-analyze

Conflicts:
	sim/paxos.py

	modified:   sim/configure.py
	modified:   sim/core.py
	modified:   sim/data.py
	modified:   sim/impl/cdetmn.py
	modified:   sim/impl/cdylock.py
	modified:   sim/impl/epdetmn.py
	modified:   sim/impl/fpdetmn.py
	modified:   sim/impl/mstdylock.py
	modified:   sim/impl/slpdetmn.py
	modified:   sim/impl/tide.py
	modified:   sim/impl/tpc.py
	modified:   sim/importutils.py
	modified:   sim/locking.py
	modified:   sim/network.py
	modified:   sim/paxos.py
	modified:   sim/perf.py
	modified:   sim/rand.py
	modified:   sim/rti.py
	modified:   sim/simulate.py
	modified:   sim/system.py
	modified:   sim/txngen.py
	modified:   sim/txns.py
	modified:   sim/verify.py