Merge branch 'master' into v2.1
commit96d54789ee149b7376e737d4803416f9746f903b
authorMike Pall <mike>
Wed, 24 Jul 2013 21:50:58 +0000 (24 23:50 +0200)
committerMike Pall <mike>
Wed, 24 Jul 2013 21:50:58 +0000 (24 23:50 +0200)
tree572292a3cee18a329ee2cf4b7063cb95f0b24c8d
parentc86f47aba587e4b8eeeba29fb572601cbb7982fd
parent6dc02450d3f8af23af8b03c96c371a897219ad61
Merge branch 'master' into v2.1
src/lj_clib.c