Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Thu, 7 Apr 2016 11:36:58 +0000 (13:36 +0200)
committerKim Alvefur <zash@zash.se>
Thu, 7 Apr 2016 11:36:58 +0000 (13:36 +0200)
commit5bafd0654b692f82e9b77064d85a66fa58508a4c
tree588eb61e21459d50577c2a3cbb2d45bce3fcedf4
parent10b79041abce5392bff5d2c56ad3be689c63bfbe
parentf46dd31ca799681a85ac069c08f48c4058051754
Merge 0.10->trunk
core/moduleapi.lua