Mercurial > prosody-hg
diff plugins/mod_s2s/s2sout.lib.lua @ 6232:d7dc71d9171d
Merge with Prosody trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 08 May 2014 18:09:59 +0100 |
| parents | ac0879a8190a |
| children | d05627c89c99 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 08 May 2014 18:09:59 +0100 |
| parents | ac0879a8190a |
| children | d05627c89c99 |