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

Simple merge