diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-05-18 00:47:35 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-05-18 00:47:35 +0100 |
commit | 939a59f26a5f5be6df6d39334879a8f46f1bc716 (patch) | |
tree | 265221640b00f27669381f5117eec81ade668258 /core/s2smanager.lua | |
parent | dbd6ecb95eae510bd2ae009f9e44c528052f6b19 (diff) | |
parent | e7abee25d8a3175fa14a02b21ba9c14c54e9fcef (diff) | |
download | prosody-939a59f26a5f5be6df6d39334879a8f46f1bc716.tar.gz prosody-939a59f26a5f5be6df6d39334879a8f46f1bc716.zip |
Merge 0.7->trunk
Diffstat (limited to 'core/s2smanager.lua')
0 files changed, 0 insertions, 0 deletions