Mercurial > prosody-hg
diff plugins/mod_s2s/mod_s2s.lua @ 6607:64e6b88b6b21
Merge 0.9->0.10 (third time lucky)
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 27 Mar 2015 22:11:58 +0000 |
| parents | 7c8f58d2b331 b1c84d220c40 |
| children | b6e558febb7a |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 27 Mar 2015 22:11:58 +0000 |
| parents | 7c8f58d2b331 b1c84d220c40 |
| children | b6e558febb7a |