Mercurial > prosody-hg
diff plugins/mod_roster.lua @ 2893:98cbc092c64c
Merge 0.7->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 18 Mar 2010 01:27:31 +0000 |
| parents | c3ea4d3f857f |
| children | 767864297afe |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 18 Mar 2010 01:27:31 +0000 |
| parents | c3ea4d3f857f |
| children | 767864297afe |