diff options
| author | Matthew Wild <mwild1@gmail.com> | 2014-01-18 18:46:31 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2014-01-18 18:46:31 +0000 |
| commit | 702c862df7561efd8a5efd773d92eafd1eedcdc0 (patch) | |
| tree | efa0d4a591840269956109110cd373cf82de3ef8 /core/s2smanager.lua | |
| parent | 2688cefaa1c82f82ce2700db8055f9868ca471d1 (diff) | |
| parent | 2420d2098c552c3224f6d9a5259abc0ee9042807 (diff) | |
| download | prosody-702c862df7561efd8a5efd773d92eafd1eedcdc0.tar.gz prosody-702c862df7561efd8a5efd773d92eafd1eedcdc0.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core/s2smanager.lua')
0 files changed, 0 insertions, 0 deletions