Merge 0.9->0.10

author Matthew Wild <mwild1@gmail.com>

Tue, 21 Jan 2014 03:24:40 +0000 (03:24 +0000)

committer Matthew Wild <mwild1@gmail.com>

Tue, 21 Jan 2014 03:24:40 +0000 (03:24 +0000)
author Matthew Wild <mwild1@gmail.com>
Tue, 21 Jan 2014 03:24:40 +0000 (03:24 +0000)
committer Matthew Wild <mwild1@gmail.com>
Tue, 21 Jan 2014 03:24:40 +0000 (03:24 +0000)
diff --cc plugins/muc/mod_muc.lua
Simple merge
diff --cc tools/ejabberd2prosody.lua
Simple merge
author	Matthew Wild <mwild1@gmail.com>
	Tue, 21 Jan 2014 03:24:40 +0000 (03:24 +0000)
committer	Matthew Wild <mwild1@gmail.com>
	Tue, 21 Jan 2014 03:24:40 +0000 (03:24 +0000)
		1	2
plugins/muc/mod_muc.lua	patch \|	diff1 \|	diff2 \|	blob \| history
tools/ejabberd2prosody.lua	patch \|	diff1 \|	diff2 \|	blob \| history