Mercurial > prosody-modules
diff mod_extdisco/mod_extdisco.lua @ 522:0c756f62758d
Merge
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 06 Jan 2012 12:13:14 +0100 |
| parents | e5c16c87383c |
| children | e302537a0e4e |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 06 Jan 2012 12:13:14 +0100 |
| parents | e5c16c87383c |
| children | e302537a0e4e |