diff options
author | Kim Alvefur <zash@zash.se> | 2015-04-05 16:24:10 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-04-05 16:24:10 +0200 |
commit | 6566d78b820a402786ae660414d36035b58e9526 (patch) | |
tree | 271bb58ce36f5669d39c95e5c74958a715b7969d /core/s2smanager.lua | |
parent | 0f75dc0721890e9426fc45938423a2b94d06ba6f (diff) | |
parent | 65c3cf814bdc794eddf78d2f7037d1d59ebc995a (diff) | |
download | prosody-6566d78b820a402786ae660414d36035b58e9526.tar.gz prosody-6566d78b820a402786ae660414d36035b58e9526.zip |
Merge 0.10->trunk
Diffstat (limited to 'core/s2smanager.lua')
0 files changed, 0 insertions, 0 deletions