Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Fri, 9 May 2014 21:35:54 +0000 (23:35 +0200)
committerKim Alvefur <zash@zash.se>
Fri, 9 May 2014 21:35:54 +0000 (23:35 +0200)
1  2 
core/moduleapi.lua

Simple merge