Merge branch 'master' into v2.1

author Mike Pall <mike>

Tue, 3 Sep 2013 14:02:54 +0000 (16:02 +0200)

committer Mike Pall <mike>

Tue, 3 Sep 2013 14:02:54 +0000 (16:02 +0200)
author Mike Pall <mike>
Tue, 3 Sep 2013 14:02:54 +0000 (16:02 +0200)
committer Mike Pall <mike>
Tue, 3 Sep 2013 14:02:54 +0000 (16:02 +0200)
diff --cc src/lj_debug.c
Simple merge
diff --cc src/ljamalg.c
Simple merge
		1	2
src/lj_debug.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/ljamalg.c	patch \|	diff1 \|	diff2 \|	blob \| history