Mercurial > prosody-hg
diff core/rostermanager.lua @ 600:2255a2e84ddc
Automated merge with http://waqas.ath.cx:8000/
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 07 Dec 2008 19:18:50 +0000 |
| parents | cccd610a0ef9 |
| children | 4ae3e81513f3 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 07 Dec 2008 19:18:50 +0000 |
| parents | cccd610a0ef9 |
| children | 4ae3e81513f3 |