diff options
author | Matthew Wild <mwild1@gmail.com> | 2014-07-31 07:14:54 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2014-07-31 07:14:54 +0100 |
commit | 4fc1aee09c0a779e8cd98645c78f668d98519b50 (patch) | |
tree | 8f4e0289c3e75e44a5062bbb7bba8306789b91d6 /util/vcard.lua | |
parent | 2991d9e427ea17227ee52240929d1ba1f98444dd (diff) | |
parent | 1afe601e8f66518777876e943a33e02a69369806 (diff) | |
download | prosody-4fc1aee09c0a779e8cd98645c78f668d98519b50.tar.gz prosody-4fc1aee09c0a779e8cd98645c78f668d98519b50.zip |
Merge 0.10->trunk
Diffstat (limited to 'util/vcard.lua')
0 files changed, 0 insertions, 0 deletions