Mercurial > prosody-hg
diff plugins/mod_disco.lua @ 1229:331a68645f67
Automated merge with http://waqas.ath.cx:8000/
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 29 May 2009 22:06:21 +0100 |
| parents | 2c0b9e3c11c3 |
| children | 83b2e07e9039 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 29 May 2009 22:06:21 +0100 |
| parents | 2c0b9e3c11c3 |
| children | 83b2e07e9039 |