Merge branch 'master' of gitorious.org:intercal/intercal

author Eric S. Raymond <esr@thyrsus.com>

Tue, 31 Aug 2010 09:56:25 +0000 (05:56 -0400)

committer Eric S. Raymond <esr@thyrsus.com>

Tue, 31 Aug 2010 09:56:25 +0000 (05:56 -0400)
author Eric S. Raymond <esr@thyrsus.com>
Tue, 31 Aug 2010 09:56:25 +0000 (05:56 -0400)
committer Eric S. Raymond <esr@thyrsus.com>
Tue, 31 Aug 2010 09:56:25 +0000 (05:56 -0400)
diff --cc pit/Makefile
Simple merge
diff --cc src/oil.y
Simple merge
author	Eric S. Raymond <esr@thyrsus.com>
	Tue, 31 Aug 2010 09:56:25 +0000 (05:56 -0400)
committer	Eric S. Raymond <esr@thyrsus.com>
	Tue, 31 Aug 2010 09:56:25 +0000 (05:56 -0400)
		1	2
pit/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
src/oil.y	patch \|	diff1 \|	diff2 \|	blob \| history