# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1532960034 -3600
# Node ID 21730a3642fefad5282d0500e3ef0c40e16f55f1
# Parent  f3adcc3fce8cf92bfb5a53da175f9d2cc21ec525# Parent  22e5f11c778af3ac2ff218e72144effea040a21e
Merge 0.10->trunk

diff -r f3adcc3fce8c -r 21730a3642fe core/sessionmanager.lua
diff -r f3adcc3fce8c -r 21730a3642fe core/stanza_router.lua
diff -r f3adcc3fce8c -r 21730a3642fe plugins/mod_s2s/mod_s2s.lua