Mercurial > prosody-hg
diff plugins/mod_vcard.lua @ 2985:fde53d82fde0
Merge 0.7->trunk (with MUC needing checking, waqas)
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 04 May 2010 23:36:50 +0100 |
| parents | b7049746bd29 |
| children | a6bae9d72c8f |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 04 May 2010 23:36:50 +0100 |
| parents | b7049746bd29 |
| children | a6bae9d72c8f |