Mercurial > prosody-modules
diff mod_remote_roster/mod_remote_roster.lua @ 1012:c53a1b8a1cfa
Merge
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 14 May 2013 16:27:05 +0100 |
| parents | 295ae44b8a01 |
| children | ad6e9b0fd15b |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 14 May 2013 16:27:05 +0100 |
| parents | 295ae44b8a01 |
| children | ad6e9b0fd15b |