Mercurial > prosody-hg
comparison core/s2smanager.lua @ 7048:b58fd349ddfe
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 04 Jan 2016 09:14:57 +0000 |
| parents | 6236668da30a |
| children | d916703d5e18 24170d74b00b |
comparison
equal
deleted
inserted
replaced
| 7046:6b4232125f32 | 7048:b58fd349ddfe |
|---|
