Merge 0.6->0.7
authorMatthew Wild <mwild1@gmail.com>
Tue, 30 Mar 2010 18:45:56 +0000 (19:45 +0100)
committerMatthew Wild <mwild1@gmail.com>
Tue, 30 Mar 2010 18:45:56 +0000 (19:45 +0100)
commitaea275d6aff664339a5edcb3f7ae3a4a866374d3
tree4f6a360e99572c86024ae4762105cb3bc812f11b
parent1f2b53f45c0a662ad5440d745f78dc050fd0c3a8
parent07f0e1b83d05ae59cf30befc2bb877bf5d145f61
Merge 0.6->0.7
core/modulemanager.lua
core/s2smanager.lua
core/stanza_router.lua
net/xmppserver_listener.lua
plugins/muc/muc.lib.lua
prosody