Mercurial > prosody-hg
diff core/s2smanager.lua @ 7104:352270bc0439 0.9.10
Merge
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 27 Jan 2016 00:06:30 +0100 |
| parents | c6c996410064 |
| children | 93eefa92527d |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 27 Jan 2016 00:06:30 +0100 |
| parents | c6c996410064 |
| children | 93eefa92527d |