Mercurial > prosody-hg
diff plugins/mod_disco.lua @ 4133:71b38dca22c3
Merge 0.8->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 31 Jan 2011 23:17:11 +0000 |
| parents | d2c4856c7ed5 |
| children | a2ee8ab82dd9 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 31 Jan 2011 23:17:11 +0000 |
| parents | d2c4856c7ed5 |
| children | a2ee8ab82dd9 |