Mercurial > prosody-hg
comparison plugins/mod_s2s/mod_s2s.lua @ 5858:89b16a160cbc
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 06 Oct 2013 23:53:15 +0200 |
| parents | 224644752bf4 |
| children | e327f2d4e09f |
comparison
equal
deleted
inserted
replaced
| 5855:275d4da9404f | 5858:89b16a160cbc |
|---|
