Merge branch 'master' into v2.1

author Mike Pall <mike>

Tue, 27 May 2014 13:59:20 +0000 (15:59 +0200)

committer Mike Pall <mike>

Tue, 27 May 2014 13:59:20 +0000 (15:59 +0200)
author Mike Pall <mike>
Tue, 27 May 2014 13:59:20 +0000 (15:59 +0200)
committer Mike Pall <mike>
Tue, 27 May 2014 13:59:20 +0000 (15:59 +0200)
diff --cc src/lj_asm_ppc.h
Simple merge
diff --cc src/lj_asm_x86.h
Simple merge
		1	2
src/lj_asm_ppc.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/lj_asm_x86.h	patch \|	diff1 \|	diff2 \|	blob \| history