Mercurial > prosody-hg
comparison plugins/mod_ping.lua @ 6168:3942630b4e35
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 09 May 2014 23:35:54 +0200 |
| parents | 7e8a624272bf |
| children | c519c778f2b2 |
comparison
equal
deleted
inserted
replaced
| 6163:7a8899d314d7 | 6168:3942630b4e35 |
|---|
