1.4
Merge branch 'master' of github.com:ekmett/trifecta

Conflicts:
	src/Text/Trifecta/Result.hs
	trifecta.cabal