# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1777479131 -3600
# Node ID e3ddbf7f2d3f8d9283dfaaa8d7c98904a64ee64b
# Parent  4985de19574986f2d56376728cf78699c0f5817d# Parent  4bbb17445ed970f697dbb9afb5dd4e52824e9f1e
Merge 0.12->13.0

diff -r 4985de195749 -r e3ddbf7f2d3f core/moduleapi.lua
diff -r 4985de195749 -r e3ddbf7f2d3f net/server_epoll.lua
diff -r 4985de195749 -r e3ddbf7f2d3f plugins/mod_c2s.lua
diff -r 4985de195749 -r e3ddbf7f2d3f plugins/mod_proxy65.lua
diff -r 4985de195749 -r e3ddbf7f2d3f plugins/mod_s2s.lua
diff -r 4985de195749 -r e3ddbf7f2d3f util/xmppstream.lua