Software / code / prosody
Diff
core/s2smanager.lua @ 6835:3afb8aa78069
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 17 Sep 2015 22:15:26 +0200 |
| parent | 6779:6236668da30a |
| child | 7452:d916703d5e18 |
| child | 7947:24170d74b00b |