# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1294325219 0
# Node ID 05a58497a903581bac93ea8114d61cf948cdd9a1
# Parent  0df6b99cb74a7151aedf7156eb6cd82fbfa56282# Parent  ba3ab4ecce34e840c468f433a159319d0861eed8
Merge 0.8->trunk

diff -r 0df6b99cb74a -r 05a58497a903 core/s2smanager.lua
diff -r 0df6b99cb74a -r 05a58497a903 plugins/mod_saslauth.lua