Mercurial > prosody-hg
diff plugins/mod_disco.lua @ 2153:08b643dc00df
Merge with trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 23 Nov 2009 16:30:34 +0000 |
| parents | 9b445d2427e2 |
| children | 29a30884aadd b7049746bd29 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 23 Nov 2009 16:30:34 +0000 |
| parents | 9b445d2427e2 |
| children | 29a30884aadd b7049746bd29 |