diff options
author | Matthew Wild <mwild1@gmail.com> | 2009-06-01 02:06:02 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2009-06-01 02:06:02 +0100 |
commit | f6b9a17b954f345038eb6d06d4ac3399f56a3d14 (patch) | |
tree | 4a0f110fe416ce209a7cdf2661fd9f30acc404e7 /core/discomanager.lua | |
parent | f68d9c8e14dedd4bab4a49b9cc9d818b9cc22c65 (diff) | |
parent | 9368b3dd1ba0b16961b18f824532be7cee4e410a (diff) | |
download | prosody-f6b9a17b954f345038eb6d06d4ac3399f56a3d14.tar.gz prosody-f6b9a17b954f345038eb6d06d4ac3399f56a3d14.zip |
Merge backout with following commits
Diffstat (limited to 'core/discomanager.lua')
0 files changed, 0 insertions, 0 deletions