Mercurial > prosody-hg
diff plugins/mod_s2s/mod_s2s.lua @ 6621:352fa2cae1c9
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 03 Apr 2015 19:34:47 +0100 |
| parents | b6e558febb7a |
| children | 071611bc4f1d 6735e2d735d6 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 03 Apr 2015 19:34:47 +0100 |
| parents | b6e558febb7a |
| children | 071611bc4f1d 6735e2d735d6 |