Merge 0.9->0.10

author Kim Alvefur <zash@zash.se>

Wed, 26 Feb 2014 21:21:55 +0000 (22:21 +0100)

committer Kim Alvefur <zash@zash.se>

Wed, 26 Feb 2014 21:21:55 +0000 (22:21 +0100)
author Kim Alvefur <zash@zash.se>
Wed, 26 Feb 2014 21:21:55 +0000 (22:21 +0100)
committer Kim Alvefur <zash@zash.se>
Wed, 26 Feb 2014 21:21:55 +0000 (22:21 +0100)
diff --cc plugins/mod_http.lua
Simple merge
diff --cc tools/ejabberd2prosody.lua
Simple merge
author	Kim Alvefur <zash@zash.se>
	Wed, 26 Feb 2014 21:21:55 +0000 (22:21 +0100)
committer	Kim Alvefur <zash@zash.se>
	Wed, 26 Feb 2014 21:21:55 +0000 (22:21 +0100)
		1	2
plugins/mod_http.lua	patch \|	diff1 \|	diff2 \|	blob \| history
tools/ejabberd2prosody.lua	patch \|	diff1 \|	diff2 \|	blob \| history