Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sat, 2 Apr 2016 15:13:12 +0000 (17:13 +0200)
committerKim Alvefur <zash@zash.se>
Sat, 2 Apr 2016 15:13:12 +0000 (17:13 +0200)
commitdcafa6940b57fdbd0ebd4c09bfb3b6122752be19
tree28ea779f6a31f7c5fe1bd22d155e502e5b44997c
parent3a95d35cc1d8aa304260229bc70cca5a6458ade7
parent26b56bc682f0a3d0a718ac4835afb8db0eb6fa93
Merge 0.10->trunk
core/storagemanager.lua
plugins/mod_bosh.lua