Merge branch 'master' into v2.1

author Mike Pall <mike>

Tue, 5 Nov 2013 18:46:41 +0000 (19:46 +0100)

committer Mike Pall <mike>

Tue, 5 Nov 2013 18:46:41 +0000 (19:46 +0100)
author Mike Pall <mike>
Tue, 5 Nov 2013 18:46:41 +0000 (19:46 +0100)
committer Mike Pall <mike>
Tue, 5 Nov 2013 18:46:41 +0000 (19:46 +0100)
diff --cc src/lj_api.c
Simple merge
diff --cc src/lj_gc.c
Simple merge
		1	2
src/lj_api.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/lj_gc.c	patch \|	diff1 \|	diff2 \|	blob \| history