Mercurial > prosody-modules
diff mod_remote_roster/mod_remote_roster.lua @ 522:0c756f62758d
Merge
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 06 Jan 2012 12:13:14 +0100 |
| parents | c86fc337d56f |
| children | 295ae44b8a01 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 06 Jan 2012 12:13:14 +0100 |
| parents | c86fc337d56f |
| children | 295ae44b8a01 |