Merge 0.6->0.7
authorMatthew Wild <mwild1@gmail.com>
Tue, 18 May 2010 22:29:21 +0000 (23:29 +0100)
committerMatthew Wild <mwild1@gmail.com>
Tue, 18 May 2010 22:29:21 +0000 (23:29 +0100)
commit8883b271b86c9d652aaa30c8dedba02bc190de08
tree01f7478a92caa8bbb6a5023f2a21e3716ca8fdc2
parenteaa09ee2dc692cb6359ab2d3f6d599a97f4962ea
parentd19b0f7d5d20265e1ed02f377a5fe223cbac4d93
Merge 0.6->0.7
13 files changed:
configure
core/configmanager.lua
core/usermanager.lua
net/xmppclient_listener.lua
plugins/mod_posix.lua
plugins/muc/muc.lib.lua
prosody
prosodyctl
util/sasl.lua
util/sasl/anonymous.lua
util/sasl/digest-md5.lua
util/sasl/plain.lua
util/sasl/scram.lua