Mercurial > prosody-modules
diff mod_extdisco/mod_extdisco.lua @ 416:10ff12fa82e2
merge.
| author | Marco Cirillo <maranda@lightwitch.org> |
|---|---|
| date | Fri, 02 Sep 2011 23:36:22 +0000 |
| parents | e5c16c87383c |
| children | e302537a0e4e |
| author | Marco Cirillo <maranda@lightwitch.org> |
|---|---|
| date | Fri, 02 Sep 2011 23:36:22 +0000 |
| parents | e5c16c87383c |
| children | e302537a0e4e |