Merge backout
authorMatthew Wild <mwild1@gmail.com>
Tue, 29 Jun 2010 19:23:11 +0000 (20:23 +0100)
committerMatthew Wild <mwild1@gmail.com>
Tue, 29 Jun 2010 19:23:11 +0000 (20:23 +0100)
commitbca1a48421947ca7d627c23433effed81a1d91f2
tree3210c4ea638ce5f9ab78f3749a33fa9b219851a9
parent311867541a9e55121340d67f8ebae68e280e304b
parent4997cb42ff04901b8f8160fa65a30dbe7396af35
Merge backout
14 files changed:
core/rostermanager.lua
core/s2smanager.lua
core/sessionmanager.lua
core/usermanager.lua
plugins/mod_announce.lua
plugins/mod_groups.lua
plugins/mod_posix.lua
plugins/mod_presence.lua
plugins/mod_saslauth.lua
prosody
prosodyctl
util/sasl/anonymous.lua
util/sasl/plain.lua
util/sasl/scram.lua