Merge with 0.6
authorMatthew Wild <mwild1@gmail.com>
Mon, 17 May 2010 10:56:36 +0000 (11:56 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 17 May 2010 10:56:36 +0000 (11:56 +0100)
commiteda4cb549bb4c1aa3938f595abe2709acbed27ce
tree2d35c345d90e88b30474393961d03b2e980cd453
parent91246125b19694e33d098762c00f130da2250c0c
parent969fd54180d645a44f11fe8b17ed8eaedfeac0e1
Merge with 0.6
12 files changed:
core/configmanager.lua
core/usermanager.lua
plugins/mod_bosh.lua
plugins/mod_console.lua
plugins/mod_posix.lua
plugins/muc/muc.lib.lua
prosody
util/sasl.lua
util/sasl/anonymous.lua
util/sasl/digest-md5.lua
util/sasl/plain.lua
util/sasl/scram.lua