Mercurial > prosody-hg
diff plugins/mod_s2s/s2sout.lib.lua @ 5088:d5bb9cd2e6df
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 10 Aug 2012 16:32:40 +0100 |
| parents | d37f2abac72c |
| children | 8b94a8d92cf3 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 10 Aug 2012 16:32:40 +0100 |
| parents | d37f2abac72c |
| children | 8b94a8d92cf3 |