Mercurial > prosody-hg
comparison plugins/mod_uptime.lua @ 600:2255a2e84ddc
Automated merge with http://waqas.ath.cx:8000/
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 07 Dec 2008 19:18:50 +0000 |
| parents | 3521e0851c9e |
| children | 4ae3e81513f3 |
comparison
equal
deleted
inserted
replaced
| 599:30655c5cc531 | 600:2255a2e84ddc |
|---|
