Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Thu, 25 Feb 2016 21:37:41 +0000 (22:37 +0100)
committerKim Alvefur <zash@zash.se>
Thu, 25 Feb 2016 21:37:41 +0000 (22:37 +0100)
1  2 
util/datamanager.lua

Simple merge