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)
commit97043cc758d50d7c918b97057eded3e7ad0c090b
tree3ed66a8f183468c3909b85dfaf5c7d76da5113eb
parente19400e305c78ad2f5e9cfa9b5c721b8cc47aafb
parent8f6b223e1dc389ae3cac9c4e9e3fbb614259f388
Merge 0.10->trunk
core/storagemanager.lua