Merge trunk->0.10
authorKim Alvefur <zash@zash.se>
Sun, 6 Mar 2016 17:52:22 +0000 (18:52 +0100)
committerKim Alvefur <zash@zash.se>
Sun, 6 Mar 2016 17:52:22 +0000 (18:52 +0100)
1  2 
core/storagemanager.lua

Simple merge