Mercurial > prosody-hg
diff plugins/mod_disco.lua @ 3304:fec74b84df61
Merge backout
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 29 Jun 2010 20:23:11 +0100 |
| parents | 692b3c6c5bd2 |
| children | c70c6d5bf270 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 29 Jun 2010 20:23:11 +0100 |
| parents | 692b3c6c5bd2 |
| children | c70c6d5bf270 |