# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1298513096 0
# Node ID fb487ee690ead472a02105e25af01873d3876838
# Parent  9c60cc8dc14271fd1005d8b36f88c89783c7e9e2# Parent  43cf7d96956f815317bc7b1e8ecf3275c4baebad
Merge 0.8->trunk

diff -r 9c60cc8dc142 -r fb487ee690ea core/s2smanager.lua
diff -r 9c60cc8dc142 -r fb487ee690ea util/stanza.lua