diff options
author | Matthew Wild <mwild1@gmail.com> | 2015-04-03 19:34:47 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2015-04-03 19:34:47 +0100 |
commit | bb866fc12337b648ad43b4cce6753e5ab8de251a (patch) | |
tree | ed4ed89ea492be641fddc99be7d2da14e5015e51 /core/s2smanager.lua | |
parent | 609d0795b4737b9bda5f5770507529a7f278808f (diff) | |
parent | 5a53fb4df8f81b02712a18c911a7c5db12a584c3 (diff) | |
download | prosody-bb866fc12337b648ad43b4cce6753e5ab8de251a.tar.gz prosody-bb866fc12337b648ad43b4cce6753e5ab8de251a.zip |
Merge 0.10->trunk
Diffstat (limited to 'core/s2smanager.lua')
0 files changed, 0 insertions, 0 deletions