Software / code / prosody
Diff
core/s2smanager.lua @ 7042:20ac6972b9aa
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 02 Jan 2016 20:42:53 +0000 |
| parent | 6779:6236668da30a |
| child | 7452:d916703d5e18 |
| child | 7947:24170d74b00b |
