Mercurial > prosody-hg
diff core/s2smanager.lua @ 7516:f74ff35a4b03
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 23 Jul 2016 18:58:58 +0200 |
| parents | d916703d5e18 |
| children | f91e7ec9654e |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 23 Jul 2016 18:58:58 +0200 |
| parents | d916703d5e18 |
| children | f91e7ec9654e |