Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Fri, 9 May 2014 21:28:09 +0000 (23:28 +0200)
committerKim Alvefur <zash@zash.se>
Fri, 9 May 2014 21:28:09 +0000 (23:28 +0200)
commitc49aa28dbba39243deba5502639e801d8ebeb3aa
tree41d836be6242730f41801164e86be6a4f76c8f25
parent12c5749806f314594b7b28de5bf33671663ca1e3
parent97dc1e55d6225d0e54c959b288acb9c0ffa9e930
Merge 0.9->0.10
core/configmanager.lua