diff options
| author | Matthew Wild <mwild1@gmail.com> | 2009-04-20 03:03:07 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2009-04-20 03:03:07 +0100 |
| commit | dabd9b0b5364630a603daecd3261d45999eff3c7 (patch) | |
| tree | dc7e3765689e50d37e541743d7e88ba9f0144b0d /core/discomanager.lua | |
| parent | f0a842ae4bcf5b7d09a08b65275e4b828838cfe5 (diff) | |
| parent | cface37b4928e922a43ef37d1bc49ab3a4009479 (diff) | |
| download | prosody-dabd9b0b5364630a603daecd3261d45999eff3c7.tar.gz prosody-dabd9b0b5364630a603daecd3261d45999eff3c7.zip | |
Merging stable into unstable
Diffstat (limited to 'core/discomanager.lua')
0 files changed, 0 insertions, 0 deletions