Mercurial > prosody-modules
diff mod_remote_roster/mod_remote_roster.lua @ 416:10ff12fa82e2
merge.
| author | Marco Cirillo <maranda@lightwitch.org> |
|---|---|
| date | Fri, 02 Sep 2011 23:36:22 +0000 |
| parents | c86fc337d56f |
| children | 295ae44b8a01 |
| author | Marco Cirillo <maranda@lightwitch.org> |
|---|---|
| date | Fri, 02 Sep 2011 23:36:22 +0000 |
| parents | c86fc337d56f |
| children | 295ae44b8a01 |