Mercurial > prosody-hg
diff core/s2smanager.lua @ 7467:9a73c85baffe
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 08 Jul 2016 15:12:44 +0200 |
| parents | d916703d5e18 |
| children | f91e7ec9654e |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 08 Jul 2016 15:12:44 +0200 |
| parents | d916703d5e18 |
| children | f91e7ec9654e |