Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 3 May 2015 16:39:27 +0000 (18:39 +0200)
committerKim Alvefur <zash@zash.se>
Sun, 3 May 2015 16:39:27 +0000 (18:39 +0200)
commitde5296c19168f21a2e3bb76de165bef59f3f7d72
treeaee8a599c4e3a3dbb516cc3b4c9e7c9fd7d82da5
parent13aa0e4ea3289b9d9980301b74c90163599c5ae8
parent384d0d3383d3ddb9dc8c024118b706c4053a1760
Merge 0.10->trunk
core/moduleapi.lua