Mercurial > prosody-hg
diff plugins/mod_s2s/s2sout.lib.lua @ 5469:fcdcc37ffec1
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 12 Apr 2013 00:45:46 +0100 |
| parents | f833d2188c16 |
| children | 40e7a6cf15ff |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 12 Apr 2013 00:45:46 +0100 |
| parents | f833d2188c16 |
| children | 40e7a6cf15ff |