Mercurial > prosody-hg
diff plugins/mod_s2s/mod_s2s.lua @ 5814:5cf1c08805fb
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 03 Sep 2013 00:20:28 +0100 |
| parents | 224644752bf4 |
| children | e327f2d4e09f |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 03 Sep 2013 00:20:28 +0100 |
| parents | 224644752bf4 |
| children | e327f2d4e09f |