Mercurial > prosody-hg
diff core/discomanager.lua @ 709:8bb83563cb21
Automated merge with http://waqas.ath.cx:8000/
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 13 Jan 2009 15:29:00 +0000 |
| parents | 3f34b83771eb |
| children | b1885732e979 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 13 Jan 2009 15:29:00 +0000 |
| parents | 3f34b83771eb |
| children | b1885732e979 |