Mercurial > prosody-hg
diff plugins/mod_ping.lua @ 6428:3ee09bfe16e1
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 23 Sep 2014 23:22:13 +0200 |
| parents | 7e8a624272bf |
| children | c519c778f2b2 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 23 Sep 2014 23:22:13 +0200 |
| parents | 7e8a624272bf |
| children | c519c778f2b2 |