aboutsummaryrefslogtreecommitdiffstats
path: root/core/s2smanager.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-07-09 00:14:27 +0100
committerMatthew Wild <mwild1@gmail.com>2015-07-09 00:14:27 +0100
commitd2d92d933717827460c637421172b410f574e619 (patch)
treeb1ae5f3567985e99fa359ae10fed5d9fdab85d91 /core/s2smanager.lua
parent31895cd45fbb41608ae19a3c02013d5ee5263f38 (diff)
parent376dd433962a1a897a239d06dbc91d3e03290fe3 (diff)
downloadprosody-d2d92d933717827460c637421172b410f574e619.tar.gz
prosody-d2d92d933717827460c637421172b410f574e619.zip
Merge 0.10->trunk
Diffstat (limited to 'core/s2smanager.lua')
0 files changed, 0 insertions, 0 deletions