Merge branch 'master' of git@github.com:fab13n/metalua into cleanup

author Fabien Fleutot <fabien@MacFabien.home>

Tue, 3 Feb 2009 07:20:48 +0000 (08:20 +0100)

committer Fabien Fleutot <fabien@MacFabien.home>

Tue, 3 Feb 2009 07:20:48 +0000 (08:20 +0100)
author Fabien Fleutot <fabien@MacFabien.home>
Tue, 3 Feb 2009 07:20:48 +0000 (08:20 +0100)
committer Fabien Fleutot <fabien@MacFabien.home>
Tue, 3 Feb 2009 07:20:48 +0000 (08:20 +0100)
diff --cc src/compiler/lexer.lua
Simple merge
diff --cc src/compiler/metalua.mlua
Simple merge
author	Fabien Fleutot <fabien@MacFabien.home>
	Tue, 3 Feb 2009 07:20:48 +0000 (08:20 +0100)
committer	Fabien Fleutot <fabien@MacFabien.home>
	Tue, 3 Feb 2009 07:20:48 +0000 (08:20 +0100)
		1	2
src/compiler/lexer.lua	patch \|	diff1 \|	diff2 \|	blob \| history
src/compiler/metalua.mlua	patch \|	diff1 \|	diff2 \|	blob \| history