Mercurial > prosody-hg
diff plugins/mod_disco.lua @ 3312:12fc7e005e8b
Merge 0.7->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 02 Jul 2010 17:44:14 +0100 |
| parents | 692b3c6c5bd2 |
| children | c70c6d5bf270 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 02 Jul 2010 17:44:14 +0100 |
| parents | 692b3c6c5bd2 |
| children | c70c6d5bf270 |