Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Thu, 18 Sep 2014 00:22:48 +0000 (02:22 +0200)
committerKim Alvefur <zash@zash.se>
Thu, 18 Sep 2014 00:22:48 +0000 (02:22 +0200)
commit95dfe4b0aaaf26ee4651c09eb9757c56210a135a
tree1e047cf0776aed91d59dc871a16563710658de9c
parent000e5fcb8e4fc3d149d8b5f24b5446e26a8733d5
parent7e7cf772e1a8f9a67598dd9a922df1a201197449
Merge 0.10->trunk
core/moduleapi.lua