Mercurial > prosody-hg
diff core/s2smanager.lua @ 7341:aa94cd27df4d
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 06 Apr 2016 14:50:34 +0200 |
| parents | 6236668da30a |
| children | d916703d5e18 24170d74b00b |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 06 Apr 2016 14:50:34 +0200 |
| parents | 6236668da30a |
| children | d916703d5e18 24170d74b00b |