diff options
author | Matthew Wild <mwild1@gmail.com> | 2009-04-23 21:06:51 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2009-04-23 21:06:51 +0100 |
commit | 2e3907bc3e56c60f947ebda858c632e9a5110943 (patch) | |
tree | b441067f58db864cb5cc070e8ba08d6f45b2e45c /core/discomanager.lua | |
parent | 3ab59e41d362ca0f1e30f18763ad9522359f6b0b (diff) | |
parent | c2e552a434eda3c9616d51f055bb459bbf561816 (diff) | |
download | prosody-2e3907bc3e56c60f947ebda858c632e9a5110943.tar.gz prosody-2e3907bc3e56c60f947ebda858c632e9a5110943.zip |
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'core/discomanager.lua')
0 files changed, 0 insertions, 0 deletions