diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-03-27 22:11:58 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-03-27 22:11:58 +0000 |
| commit | 29f906c30d10ce983b6c034d88bf7a3c8b576bb0 (patch) | |
| tree | 05c689e53d3416f52f0e9c782cf05887e5fe14da /core/s2smanager.lua | |
| parent | 13edf3e093fd656d5110b277eca4c9805f3d925c (diff) | |
| parent | 51bef3673c57c5a2e323a7eb1424c85498905f53 (diff) | |
| download | prosody-29f906c30d10ce983b6c034d88bf7a3c8b576bb0.tar.gz prosody-29f906c30d10ce983b6c034d88bf7a3c8b576bb0.zip | |
Merge 0.9->0.10 (third time lucky)
Diffstat (limited to 'core/s2smanager.lua')
0 files changed, 0 insertions, 0 deletions