diff options
author | Matthew Wild <mwild1@gmail.com> | 2009-10-05 17:57:59 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2009-10-05 17:57:59 +0100 |
commit | ae795496e307f5f162231af2bbc98a2828482698 (patch) | |
tree | 67c29436216c0e2fe8e472d19d88081cce1cc5f4 /core/discomanager.lua | |
parent | 6fa482aafafe1eb58bcb5c520652e16938dcfd06 (diff) | |
parent | 59c937eb4308af90eb88dd4f82c328084191aff2 (diff) | |
download | prosody-ae795496e307f5f162231af2bbc98a2828482698.tar.gz prosody-ae795496e307f5f162231af2bbc98a2828482698.zip |
Merge with 0.5
Diffstat (limited to 'core/discomanager.lua')
0 files changed, 0 insertions, 0 deletions