Merge branch 'master' into v2.1
commitcaefd06871a6e2e673520d8565a51257e735a097
authorMike Pall <mike>
Mon, 31 Mar 2014 22:34:13 +0000 (1 00:34 +0200)
committerMike Pall <mike>
Mon, 31 Mar 2014 22:34:13 +0000 (1 00:34 +0200)
tree1f49a3202d1cd039d4a4a2c613c198f7c805ff07
parentb65515fb4831d3cd9071c31ed56ba2a95578189a
parent19b69f21d409375ad8362c04186b246c1749fc8e
Merge branch 'master' into v2.1
src/lj_carith.c
src/lj_crecord.c