Merge branch 'master' into v2.1

author Mike Pall <mike>

Mon, 31 Mar 2014 22:34:13 +0000 (00:34 +0200)

committer Mike Pall <mike>

Mon, 31 Mar 2014 22:34:13 +0000 (00:34 +0200)
author Mike Pall <mike>
Mon, 31 Mar 2014 22:34:13 +0000 (00:34 +0200)
committer Mike Pall <mike>
Mon, 31 Mar 2014 22:34:13 +0000 (00:34 +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