Merge branch 'master' into v2.1

author Mike Pall <mike>

Tue, 8 Apr 2014 10:12:27 +0000 (12:12 +0200)

committer Mike Pall <mike>

Tue, 8 Apr 2014 10:12:27 +0000 (12:12 +0200)
author Mike Pall <mike>
Tue, 8 Apr 2014 10:12:27 +0000 (12:12 +0200)
committer Mike Pall <mike>
Tue, 8 Apr 2014 10:12:27 +0000 (12:12 +0200)
diff --cc src/lj_carith.c
Simple merge
diff --cc src/lj_crecord.c
Simple merge
		1	2
src/lj_carith.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/lj_crecord.c	patch \|	diff1 \|	diff2 \|	blob \| history