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)
commitf760c52919054661d998f7e0b628a317dedfa4cd
tree6eb92ddf3c625ece4bde037e1d1cedc3a7c19948
parentdc39a83570d09eacc4edba2ac176697da4ebf67c
parentdc15b49d6e32cc7cbb851c88eb4b2cd784ab1e63
Merge 0.10->trunk
core/storagemanager.lua