Mercurial > prosody-hg
diff plugins/mod_disco.lua @ 3202:1a8a5b89a5ad
Merge 0.7->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 09 Jun 2010 01:11:12 +0100 |
| parents | 692b3c6c5bd2 |
| children | c70c6d5bf270 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 09 Jun 2010 01:11:12 +0100 |
| parents | 692b3c6c5bd2 |
| children | c70c6d5bf270 |