Mercurial > prosody-modules
diff mod_extdisco/mod_extdisco.lua @ 1012:c53a1b8a1cfa
Merge
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 14 May 2013 16:27:05 +0100 |
| parents | e5c16c87383c |
| children | e302537a0e4e |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 14 May 2013 16:27:05 +0100 |
| parents | e5c16c87383c |
| children | e302537a0e4e |