Mercurial > prosody-hg
diff plugins/mod_s2s/mod_s2s.lua @ 6563:f0a2bdfd0cea
Merge with 0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 31 Jan 2015 12:25:00 +0000 |
| parents | 7c8f58d2b331 |
| children | 61b6a4fc65f1 64e6b88b6b21 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 31 Jan 2015 12:25:00 +0000 |
| parents | 7c8f58d2b331 |
| children | 61b6a4fc65f1 64e6b88b6b21 |