Mercurial > prosody-hg
diff plugins/mod_disco.lua @ 5206:b4de85209ccf
Merge
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 29 Nov 2012 07:17:31 +0500 |
| parents | c0c060e450be |
| children | 0439d1349dc1 57060d0cee4b |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 29 Nov 2012 07:17:31 +0500 |
| parents | c0c060e450be |
| children | 0439d1349dc1 57060d0cee4b |