Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Wed, 10 Feb 2016 06:57:58 +0000 (07:57 +0100)
committerKim Alvefur <zash@zash.se>
Wed, 10 Feb 2016 06:57:58 +0000 (07:57 +0100)
1  2 
core/storagemanager.lua

Simple merge