Mercurial > prosody-hg
diff plugins/mod_disco.lua @ 4226:decfa487e1e8
Merge 0.8->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 18 Mar 2011 10:33:38 +0000 |
| parents | d2c4856c7ed5 |
| children | a2ee8ab82dd9 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 18 Mar 2011 10:33:38 +0000 |
| parents | d2c4856c7ed5 |
| children | a2ee8ab82dd9 |