Mercurial > prosody-hg
diff core/presencemanager.lua @ 475:fe861de7a4fc
Forced merge.
| author | Tobias Markmann <tm@ayena.de> |
|---|---|
| date | Sat, 29 Nov 2008 11:24:59 +0100 |
| parents | 99a8317d1235 |
| children | ab49cb6d0e92 |
| author | Tobias Markmann <tm@ayena.de> |
|---|---|
| date | Sat, 29 Nov 2008 11:24:59 +0100 |
| parents | 99a8317d1235 |
| children | ab49cb6d0e92 |