Merge branch 'master' into v2.1
commit4401af88dca4c8b415cd98e548d17688df92acee
authorMike Pall <mike>
Thu, 27 Mar 2014 22:32:45 +0000 (27 23:32 +0100)
committerMike Pall <mike>
Thu, 27 Mar 2014 22:32:45 +0000 (27 23:32 +0100)
treeff1787dfc2a364237d0ad3b62949045a29d6b83c
parent3500c35e23c89fe728d6aa1404cf1324483caddc
parent095344ce7ca1f8eb30987086a2b4dc78b9d813e6
Merge branch 'master' into v2.1
src/lj_jit.h
src/lj_record.c