Merge 0.10->trunk

author Kim Alvefur <zash@zash.se>

Sat, 2 Apr 2016 15:13:12 +0000 (17:13 +0200)

committer Kim Alvefur <zash@zash.se>

Sat, 2 Apr 2016 15:13:12 +0000 (17:13 +0200)
author Kim Alvefur <zash@zash.se>
Sat, 2 Apr 2016 15:13:12 +0000 (17:13 +0200)
committer Kim Alvefur <zash@zash.se>
Sat, 2 Apr 2016 15:13:12 +0000 (17:13 +0200)
diff --cc core/storagemanager.lua
Simple merge
diff --cc plugins/mod_bosh.lua
Simple merge
author	Kim Alvefur <zash@zash.se>
	Sat, 2 Apr 2016 15:13:12 +0000 (17:13 +0200)
committer	Kim Alvefur <zash@zash.se>
	Sat, 2 Apr 2016 15:13:12 +0000 (17:13 +0200)
		1	2
core/storagemanager.lua	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/mod_bosh.lua	patch \|	diff1 \|	diff2 \|	blob \| history