diff options
author | Matthew Wild <mwild1@gmail.com> | 2009-08-08 22:09:59 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2009-08-08 22:09:59 +0100 |
commit | 1cffdf3339206be7f2fbb3741a9b82d1be8f2ae6 (patch) | |
tree | 147d7ce3327c0caf2fc17e979ef87bba2d94ba29 /core/discomanager.lua | |
parent | 9a336a6d926095cdf9f7beefca6208c75405f807 (diff) | |
parent | 9b3f3c93e368ad92e5d3add7abd4b5ec22dedb64 (diff) | |
download | prosody-1cffdf3339206be7f2fbb3741a9b82d1be8f2ae6.tar.gz prosody-1cffdf3339206be7f2fbb3741a9b82d1be8f2ae6.zip |
Merge with albert and waqas
Diffstat (limited to 'core/discomanager.lua')
0 files changed, 0 insertions, 0 deletions