Mercurial > prosody-hg
diff plugins/mod_s2s/mod_s2s.lua @ 6679:96e034508978
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 13 May 2015 17:00:27 +0100 |
| parents | 42fdc8dddf04 |
| children | b2e89583d6e6 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 13 May 2015 17:00:27 +0100 |
| parents | 42fdc8dddf04 |
| children | b2e89583d6e6 |