Mercurial > prosody-hg
diff plugins/mod_s2s/s2sout.lib.lua @ 4956:bc26e6d519ae
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 19 Jul 2012 15:36:31 +0100 |
| parents | 760a1f367f02 |
| children | 1722a6bea115 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 19 Jul 2012 15:36:31 +0100 |
| parents | 760a1f367f02 |
| children | 1722a6bea115 |