Merge branch 'master' into v2.1

author Mike Pall <mike>

Thu, 27 Mar 2014 22:32:45 +0000 (23:32 +0100)

committer Mike Pall <mike>

Thu, 27 Mar 2014 22:32:45 +0000 (23:32 +0100)
author Mike Pall <mike>
Thu, 27 Mar 2014 22:32:45 +0000 (23:32 +0100)
committer Mike Pall <mike>
Thu, 27 Mar 2014 22:32:45 +0000 (23:32 +0100)
diff --cc src/lj_jit.h
Simple merge
diff --cc src/lj_record.c
Simple merge
		1	2
src/lj_jit.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/lj_record.c	patch \|	diff1 \|	diff2 \|	blob \| history