Mercurial > prosody-hg
diff plugins/mod_vcard.lua @ 4281:5a0144a032d8
Merge 0.6->0.7
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 02 Jun 2011 00:25:44 +0100 |
| parents | b7049746bd29 |
| children | a6bae9d72c8f |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 02 Jun 2011 00:25:44 +0100 |
| parents | b7049746bd29 |
| children | a6bae9d72c8f |