Mercurial > prosody-hg
diff util/vcard.lua @ 6621:352fa2cae1c9
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 03 Apr 2015 19:34:47 +0100 |
| parents | 95241c0f9244 |
| children | e5d00bf4a4d5 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 03 Apr 2015 19:34:47 +0100 |
| parents | 95241c0f9244 |
| children | e5d00bf4a4d5 |