Mercurial > prosody-hg
diff plugins/mod_roster.lua @ 4956:bc26e6d519ae
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 19 Jul 2012 15:36:31 +0100 |
| parents | d56c26c258e4 |
| children | ab693eea0869 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 19 Jul 2012 15:36:31 +0100 |
| parents | d56c26c258e4 |
| children | ab693eea0869 |