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