Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 2 Sep 2015 17:55:35 +0000 (18:55 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 2 Sep 2015 17:55:35 +0000 (18:55 +0100)
1  2 
core/storagemanager.lua

Simple merge