Mercurial > prosody-hg
comparison plugins/mod_ping.lua @ 6690:b2e89583d6e6
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 13 May 2015 22:33:40 +0200 |
| parents | 7e8a624272bf |
| children | c519c778f2b2 |
comparison
equal
deleted
inserted
replaced
| 6679:96e034508978 | 6690:b2e89583d6e6 |
|---|
