Mercurial > prosody-hg
diff plugins/mod_vcard.lua @ 5993:ef11b8bab405
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 18 Jan 2014 18:46:12 +0000 |
| parents | bd0ff8ae98a8 |
| children | 3ce18a4018f4 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 18 Jan 2014 18:46:12 +0000 |
| parents | bd0ff8ae98a8 |
| children | 3ce18a4018f4 |