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)
commit544e05fb68f869526b71194c3bed3edd7311f3fe
treeddceb76cc5d0ed0d0843cd44a277f3e106dde843
parentadb8143eb10698e843616c65ca462ff5388bfaeb
parentb0d046f37b7af85a813823079967cb870d3b9235
Merge 0.9->0.10
util/datamanager.lua