Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Thu, 18 Feb 2016 14:00:17 +0000 (15:00 +0100)
committerKim Alvefur <zash@zash.se>
Thu, 18 Feb 2016 14:00:17 +0000 (15:00 +0100)
commit3c561ed7ab90acb90ea8cec61d912586b91fe56b
tree795a0ac90dca04a33c4dcf87e0f79c26438288ac
parentf75973e6831d45018dc2c704d01da9a57701737a
parentf81030839324cc51adac61130a0638205e1f4fc2
Merge 0.10->trunk
core/moduleapi.lua