Mercurial > prosody-hg
diff core/s2smanager.lua @ 7085:343be83ddfa6
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 16 Jan 2016 22:44:43 +0100 |
| parents | 6236668da30a |
| children | d916703d5e18 24170d74b00b |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 16 Jan 2016 22:44:43 +0100 |
| parents | 6236668da30a |
| children | d916703d5e18 24170d74b00b |