Software / code / prosody
Diff
core/s2smanager.lua @ 7171:91d36a37a9ff
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 21 Feb 2016 16:54:56 +0100 |
| parent | 6779:6236668da30a |
| child | 7452:d916703d5e18 |
| child | 7947:24170d74b00b |