Mercurial > prosody-hg
diff plugins/mod_disco.lua @ 5069:7b298f8bcbcb
Merge Waqas<>Zash
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 31 Jul 2012 23:07:02 +0100 |
| parents | 0f72123ff513 |
| children | c0c060e450be |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 31 Jul 2012 23:07:02 +0100 |
| parents | 0f72123ff513 |
| children | c0c060e450be |