Merge with backout
authorMatthew Wild <mwild1@gmail.com>
Fri, 21 May 2010 18:45:33 +0000 (19:45 +0100)
committerMatthew Wild <mwild1@gmail.com>
Fri, 21 May 2010 18:45:33 +0000 (19:45 +0100)
commit416b600dd4475c7862070514895eb9314789d5e2
treeca92b419c05d50ee628a33316bdffccc2e3770a3
parentcbef3a1022223109c3ba9205ca621a9be040b0fa
parent9a027209a704f190084e982c3ea539525220cb35
Merge with backout
13 files changed:
core/configmanager.lua
core/eventmanager.lua
core/usermanager.lua
net/xmppclient_listener.lua
plugins/mod_offline.lua
plugins/mod_posix.lua
plugins/mod_presence.lua
plugins/muc/muc.lib.lua
prosody
prosodyctl
util/sasl.lua
util/sasl/digest-md5.lua
util/sasl/scram.lua