Merge branch 'master' into v2.1
commit8cc89332ffa3b65a43f6e730df18e282bb66ea41
authorMike Pall <mike>
Fri, 28 Nov 2014 19:21:35 +0000 (28 20:21 +0100)
committerMike Pall <mike>
Fri, 28 Nov 2014 19:21:35 +0000 (28 20:21 +0100)
tree47c2d8110c12739e338542e4d4b984ccb0fd4453
parent42ed4e53a525cdd763b3707f6c41d5bd9ec92689
parentc75c62b489ebd0b4f9eb35af3b7d5a071939721e
Merge branch 'master' into v2.1
src/lj_asm.c