diff options
author | Matthew Wild <mwild1@gmail.com> | 2009-06-29 14:13:49 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2009-06-29 14:13:49 +0100 |
commit | c1671142d38ccd0a9295b4c7ea3f4d2d90e572e8 (patch) | |
tree | a3e28c47c0020627f7ebb008d1e410f67006082a /plugins/mod_vcard.lua | |
parent | d28fa4c70b359a54223244ec5b98fa5965e0028a (diff) | |
parent | 9ae52811fea92946f5377eb2c3fcadfe22700aca (diff) | |
download | prosody-c1671142d38ccd0a9295b4c7ea3f4d2d90e572e8.tar.gz prosody-c1671142d38ccd0a9295b4c7ea3f4d2d90e572e8.zip |
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'plugins/mod_vcard.lua')
0 files changed, 0 insertions, 0 deletions