Mercurial > prosody-hg
diff plugins/mod_s2s/mod_s2s.lua @ 5602:e8a0e545ee05
Merge
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 18 May 2013 15:29:31 +0100 |
| parents | ad66ee47b674 |
| children | d323932ecf18 e6a9085f0ac3 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 18 May 2013 15:29:31 +0100 |
| parents | ad66ee47b674 |
| children | d323932ecf18 e6a9085f0ac3 |