Mercurial > prosody-hg
diff plugins/mod_disco.lua @ 4144:a1ff207af280
Merge 0.8->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 13 Feb 2011 22:59:27 +0000 |
| parents | d2c4856c7ed5 |
| children | a2ee8ab82dd9 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 13 Feb 2011 22:59:27 +0000 |
| parents | d2c4856c7ed5 |
| children | a2ee8ab82dd9 |