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)
commit899e1fd6cbe80b308f8d6f36d9f1b9cded7db44c
treea1a33856cc4d36b0f99c1c4a1fbc2cdbb157046d
parentc680296542b957a42a64b7181151ab74ebaad316
parentc49aa28dbba39243deba5502639e801d8ebeb3aa
Merge 0.10->trunk
core/moduleapi.lua