diff options
author | Matthew Wild <mwild1@gmail.com> | 2012-07-22 18:52:20 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2012-07-22 18:52:20 +0100 |
commit | d0fd520b7bb57186f29f5c090569b9712f2ef6bd (patch) | |
tree | 9869dd79155c8a772cec73c5e2cfe9201da10636 /core/rostermanager.lua | |
parent | c6b709ed7fa4bab314285473b79b37729ef03863 (diff) | |
parent | 00038375f5fc116b761b3f3f1f8f2f0f4791a3dd (diff) | |
download | prosody-d0fd520b7bb57186f29f5c090569b9712f2ef6bd.tar.gz prosody-d0fd520b7bb57186f29f5c090569b9712f2ef6bd.zip |
Merge with Maranda
Diffstat (limited to 'core/rostermanager.lua')
0 files changed, 0 insertions, 0 deletions