Mercurial > prosody-hg
diff plugins/mod_vcard.lua @ 5201:99cb5170a2ea
Merge 0.9->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 23 Nov 2012 17:17:02 +0100 |
| parents | a6bae9d72c8f |
| children | eeea0eb2602a |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 23 Nov 2012 17:17:02 +0100 |
| parents | a6bae9d72c8f |
| children | eeea0eb2602a |