Mercurial > prosody-hg
diff plugins/mod_s2s/mod_s2s.lua @ 5574:40fe8bd35eaa
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 11 May 2013 13:55:14 +0100 |
| parents | df3c78221f26 |
| children | ad66ee47b674 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 11 May 2013 13:55:14 +0100 |
| parents | df3c78221f26 |
| children | ad66ee47b674 |