diff options
author | Kim Alvefur <zash@zash.se> | 2013-07-10 07:47:54 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2013-07-10 07:47:54 +0200 |
commit | 7cbbf991bc5f48bedaaa39926f524c90660dcd25 (patch) | |
tree | 906dfdf5f30e7168f5ed66077d09faae6a5a7498 /core/s2smanager.lua | |
parent | b5ccfb0d7836918c0a65688df2f52e593304d83c (diff) | |
parent | 5b13d561ee874824d6f4ab70d72307264f22973f (diff) | |
download | prosody-7cbbf991bc5f48bedaaa39926f524c90660dcd25.tar.gz prosody-7cbbf991bc5f48bedaaa39926f524c90660dcd25.zip |
Merge 0.9->trunk
Diffstat (limited to 'core/s2smanager.lua')
0 files changed, 0 insertions, 0 deletions