# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1596906792 -7200
# Node ID d1604721b665abdaa28f333d548cd56d4a871bcd
# Parent  1f41f38a92f7007bbdacdc2db4bc7b3c488effbe# Parent  bacca65ce107b8549ce5f9079e81e5771eed2021
Merge 0.11->trunk

diff -r 1f41f38a92f7 -r d1604721b665 plugins/mod_s2s.lua