aboutsummaryrefslogtreecommitdiffstats
path: root/core/s2smanager.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-11-24 14:24:53 +0100
committerKim Alvefur <zash@zash.se>2013-11-24 14:24:53 +0100
commit808d86f23f857721b310cfeba18884d2bb0f5301 (patch)
treea2c0c940737f448a1d9baa03f8d6ee7c8712de84 /core/s2smanager.lua
parent62fa3829038c60a13929feac244833fabae48c43 (diff)
parent6adc7b6322346a732248f21d474b27f35816bad0 (diff)
downloadprosody-808d86f23f857721b310cfeba18884d2bb0f5301.tar.gz
prosody-808d86f23f857721b310cfeba18884d2bb0f5301.zip
Merge 0.10->trunk
Diffstat (limited to 'core/s2smanager.lua')
0 files changed, 0 insertions, 0 deletions