Mercurial > prosody-hg
diff core/s2smanager.lua @ 7348:a8ca12e7c2fb
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 08 Apr 2016 17:54:50 +0200 |
| parents | 6236668da30a |
| children | d916703d5e18 24170d74b00b |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 08 Apr 2016 17:54:50 +0200 |
| parents | 6236668da30a |
| children | d916703d5e18 24170d74b00b |