From: Badlop <badlop@process-one.net>
Date: Fri, 1 Feb 2019 15:21:58 +0000 (+0100)
Subject: Merge branch 'mod_ping_no_kill' of https://github.com/fdie/ejabberd into 3
X-Git-Tag: 19.02~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8baced0d8bb248bcc5a48c5bcf36aac17b5dbcb3;p=ejabberd

Merge branch 'mod_ping_no_kill' of https://github.com/fdie/ejabberd into 3
---

8baced0d8bb248bcc5a48c5bcf36aac17b5dbcb3