Merge 0.9->0.10
authorMatthew Wild <mwild1@gmail.com>
Tue, 21 Jan 2014 03:24:40 +0000 (03:24 +0000)
committerMatthew Wild <mwild1@gmail.com>
Tue, 21 Jan 2014 03:24:40 +0000 (03:24 +0000)
commit26f5fc092e3196959775bbcaef4acf629bb08975
tree3ce705dc8e88018d05eb737fa2cc432e7f2e5fc8
parent03ee26ef4d18b348c52d52ee86131aa983750fac
parent21065eedba17777ce909972ae0c94ba4aed7a000
Merge 0.9->0.10
plugins/muc/mod_muc.lua
tools/ejabberd2prosody.lua