Mercurial > prosody-hg
diff plugins/mod_disco.lua @ 2878:9384ee36fc03
Merge 0.6.2/waqas with 0.6.2/MattJ
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 03 Mar 2010 22:05:05 +0000 |
| parents | 4be6810914eb |
| children | 692b3c6c5bd2 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 03 Mar 2010 22:05:05 +0000 |
| parents | 4be6810914eb |
| children | 692b3c6c5bd2 |