diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-03-17 14:28:26 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-03-17 14:28:26 +0000 |
commit | 48e4e284e95e0d8ea1d65357b3aef3740ee9a4d8 (patch) | |
tree | 8510c8cc65a52fb789d8fb0bb942ea84a3bf5d08 /core/s2smanager.lua | |
parent | 2650d367fa08e67a0a1f6cfbaaebf5fd3221ecd6 (diff) | |
parent | b3aafb2c908ee767656555086c9c08c471f5063a (diff) | |
download | prosody-48e4e284e95e0d8ea1d65357b3aef3740ee9a4d8.tar.gz prosody-48e4e284e95e0d8ea1d65357b3aef3740ee9a4d8.zip |
Merge with 0.6 (into 0.7, namely mod_compression fixes)
Diffstat (limited to 'core/s2smanager.lua')
0 files changed, 0 insertions, 0 deletions