Mercurial > prosody-modules
diff mod_compat_vcard/mod_compat_vcard.lua @ 927:a9dfa7232d88
Merge
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Tue, 12 Mar 2013 12:10:25 +0000 |
parents | 1a7cdc874b8c |
children | 3df303543765 |
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Tue, 12 Mar 2013 12:10:25 +0000 |
parents | 1a7cdc874b8c |
children | 3df303543765 |