Merge 0.6->0.7
authorMatthew Wild <mwild1@gmail.com>
Wed, 1 Jun 2011 22:25:24 +0000 (23:25 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 1 Jun 2011 22:25:24 +0000 (23:25 +0100)
commitec33912360b3958cc27bfe74fa94583b066d9237
treee1af16c7d02a6182dc2b19ca0bdbdb6e86d85052
parent67972219b74e6315bcd23966e3570594e47456e3
parent7ed8cb94a08dc6e45f64e340140cc570d768c161
Merge 0.6->0.7
28 files changed:
configure
core/configmanager.lua
core/rostermanager.lua
core/s2smanager.lua
core/sessionmanager.lua
core/usermanager.lua
core/xmlhandlers.lua
net/dns.lua
net/server_event.lua
net/server_select.lua
net/xmppclient_listener.lua
plugins/mod_announce.lua
plugins/mod_bosh.lua
plugins/mod_compression.lua
plugins/mod_groups.lua
plugins/mod_posix.lua
plugins/mod_presence.lua
plugins/mod_privacy.lua
plugins/mod_register.lua
plugins/mod_saslauth.lua
plugins/muc/muc.lib.lua
prosody
prosodyctl
tools/xep227toprosody.lua
util/sasl/anonymous.lua
util/sasl/plain.lua
util/sasl/scram.lua
util/sasl_cyrus.lua