Mercurial > prosody-hg
diff plugins/mod_disco.lua @ 4245:2494d299d8a2
Merge 0.8->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 06 Apr 2011 14:48:00 +0100 |
| parents | d2c4856c7ed5 |
| children | a2ee8ab82dd9 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 06 Apr 2011 14:48:00 +0100 |
| parents | d2c4856c7ed5 |
| children | a2ee8ab82dd9 |