ASTAR?
Merge branch 'master' of github.com:adamse/mmc2

Conflicts:
	mmc2.cabal