Mercurial > prosody-hg
diff plugins/mod_disco.lua @ 1545:e6bd29342f65
Merge with 0.5
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 12 Jul 2009 20:33:09 +0100 |
| parents | 841d61be198f |
| children | 53d16a28ee00 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 12 Jul 2009 20:33:09 +0100 |
| parents | 841d61be198f |
| children | 53d16a28ee00 |