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)
1  2 
core/moduleapi.lua

Simple merge