Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Mon, 30 Jul 2018 15:13:54 +0100
changeset 9073 21730a3642fe
parent 9068 f3adcc3fce8c (current diff)
parent 9072 22e5f11c778a (diff)
child 9074 db61e33bbd41
Merge 0.10->trunk
core/sessionmanager.lua
core/stanza_router.lua
plugins/mod_s2s/mod_s2s.lua