diff options
author | Matthew Wild <mwild1@gmail.com> | 2008-10-22 23:12:26 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2008-10-22 23:12:26 +0100 |
commit | e92bd250d19de43dfe0584108d12577bbe1a1c2a (patch) | |
tree | 01823b0990afedda8cc7ca448f9f975cd6e9d936 /main.lua | |
parent | ee7b432ab1d450a42fae24b37c79b7fbda7f4e6b (diff) | |
parent | c3ca55e0195d03c3e0c23590c387c49068be7723 (diff) | |
download | prosody-e92bd250d19de43dfe0584108d12577bbe1a1c2a.tar.gz prosody-e92bd250d19de43dfe0584108d12577bbe1a1c2a.zip |
Merge roster & presence from waqas
Diffstat (limited to 'main.lua')
0 files changed, 0 insertions, 0 deletions