diff options
author | Kim Alvefur <zash@zash.se> | 2015-08-26 13:17:37 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-08-26 13:17:37 +0200 |
commit | 0bb135486abae381614dc0547b55ba08cfdc8ac3 (patch) | |
tree | 9dc703a47bdb80713dc5c5926a4215a12b0337fe /core/s2smanager.lua | |
parent | 4625bd8f510121530cd4166338d39359ac739b3d (diff) | |
parent | 345a2e09f6a7fedd1037d7183548e60c6302719a (diff) | |
download | prosody-0bb135486abae381614dc0547b55ba08cfdc8ac3.tar.gz prosody-0bb135486abae381614dc0547b55ba08cfdc8ac3.zip |
Merge 0.10->trunk
Diffstat (limited to 'core/s2smanager.lua')
0 files changed, 0 insertions, 0 deletions