diff options
author | Kim Alvefur <zash@zash.se> | 2013-06-09 17:03:15 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2013-06-09 17:03:15 +0200 |
commit | 1e29dc5c934fd38f4318679eb58a5ef106107cca (patch) | |
tree | d2df3e2e2d6e79961b1a312a8049eed3f6c55da5 /core/s2smanager.lua | |
parent | bf631330f98adca03705f2f1eda337998338fc71 (diff) | |
parent | d7d15e2ec79c83f13e4dd8bf7c52db658290d336 (diff) | |
download | prosody-1e29dc5c934fd38f4318679eb58a5ef106107cca.tar.gz prosody-1e29dc5c934fd38f4318679eb58a5ef106107cca.zip |
Merge 0.9->trunk
Diffstat (limited to 'core/s2smanager.lua')
0 files changed, 0 insertions, 0 deletions