Mercurial > prosody-hg
diff plugins/mod_ping.lua @ 6315:7a3e2f2d43fc
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 25 Jul 2014 13:54:27 +0100 |
| parents | 7e8a624272bf |
| children | c519c778f2b2 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 25 Jul 2014 13:54:27 +0100 |
| parents | 7e8a624272bf |
| children | c519c778f2b2 |