diff options
author | Matthew Wild <mwild1@gmail.com> | 2009-06-01 01:36:42 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2009-06-01 01:36:42 +0100 |
commit | f68d9c8e14dedd4bab4a49b9cc9d818b9cc22c65 (patch) | |
tree | 57bb090dfc3a278993148b96bf1832e640c5287a /core/presencemanager.lua | |
parent | a406492eac0743ee7c842defe9622b143992d3da (diff) | |
parent | f87fd81a4a3de75958eb489de371fa6830e48fb2 (diff) | |
download | prosody-f68d9c8e14dedd4bab4a49b9cc9d818b9cc22c65.tar.gz prosody-f68d9c8e14dedd4bab4a49b9cc9d818b9cc22c65.zip |
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'core/presencemanager.lua')
0 files changed, 0 insertions, 0 deletions