Mercurial > prosody-hg
comparison plugins/mod_disco.lua @ 4290:aaa06e68a9e4
Merge 0.8->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 02 Jun 2011 15:28:41 +0100 |
| parents | d2c4856c7ed5 |
| children | a2ee8ab82dd9 |
comparison
equal
deleted
inserted
replaced
| 4286:1bceebe2b117 | 4290:aaa06e68a9e4 |
|---|
