Mercurial > prosody-hg
comparison plugins/mod_vcard.lua @ 5160:da7fe5de82fb
Merge 0.9 -> trunk (like this?)
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 29 Sep 2012 01:05:17 +0200 |
| parents | a6bae9d72c8f |
| children | eeea0eb2602a |
comparison
equal
deleted
inserted
replaced
| 5159:0638ff1e1a5a | 5160:da7fe5de82fb |
|---|
