Merge branch 'master' into v2.1

author Mike Pall <mike>

Fri, 28 Feb 2014 13:10:30 +0000 (14:10 +0100)

committer Mike Pall <mike>

Fri, 28 Feb 2014 13:10:30 +0000 (14:10 +0100)
author Mike Pall <mike>
Fri, 28 Feb 2014 13:10:30 +0000 (14:10 +0100)
committer Mike Pall <mike>
Fri, 28 Feb 2014 13:10:30 +0000 (14:10 +0100)
diff --cc src/jit/dump.lua
Simple merge
diff --cc src/lj_record.c
Simple merge
		1	2
src/jit/dump.lua	patch \|	diff1 \|	diff2 \|	blob \| history
src/lj_record.c	patch \|	diff1 \|	diff2 \|	blob \| history