diff options
author | Matthew Wild <mwild1@gmail.com> | 2012-02-24 16:25:45 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2012-02-24 16:25:45 +0000 |
commit | b178521e828be9b8a92b6f4225df6036cdcdd5d1 (patch) | |
tree | 0fc9c99439149af544531ccd36cfeb50aabf0418 /core/s2smanager.lua | |
parent | b26626109f7bbe808303787f619b67cb64792269 (diff) | |
parent | b51c0bea3f88b1bc58ffc83c3ec2b0ef6fc31235 (diff) | |
download | prosody-b178521e828be9b8a92b6f4225df6036cdcdd5d1.tar.gz prosody-b178521e828be9b8a92b6f4225df6036cdcdd5d1.zip |
Merge backout
Diffstat (limited to 'core/s2smanager.lua')
0 files changed, 0 insertions, 0 deletions