Mercurial > prosody-hg
diff plugins/mod_roster.lua @ 3301:772fb30b28fb
Merge 0.7->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 29 Jun 2010 20:17:21 +0100 |
| parents | 692b3c6c5bd2 |
| children | 5228a395999b |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 29 Jun 2010 20:17:21 +0100 |
| parents | 692b3c6c5bd2 |
| children | 5228a395999b |