Software / code / prosody
Diff
core/s2smanager.lua @ 6811:82350a06df6e
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 02 Sep 2015 18:55:35 +0100 |
| parent | 6779:6236668da30a |
| child | 7452:d916703d5e18 |
| child | 7947:24170d74b00b |
