Mercurial > prosody-hg
diff util/vcard.lua @ 6285:ea60d0441df7
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 21 Jun 2014 15:05:52 +0200 |
| parents | f8945a030bc6 |
| children | 94c3cf8293a7 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 21 Jun 2014 15:05:52 +0200 |
| parents | f8945a030bc6 |
| children | 94c3cf8293a7 |