Mercurial > prosody-hg
diff plugins/mod_vcard.lua @ 5489:421c7830eccc
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 18 Apr 2013 00:10:52 +0100 |
| parents | a6bae9d72c8f |
| children | eeea0eb2602a |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 18 Apr 2013 00:10:52 +0100 |
| parents | a6bae9d72c8f |
| children | eeea0eb2602a |