Mercurial > prosody-hg
diff plugins/mod_s2s/s2sout.lib.lua @ 5536:abb6c6e3d6dc
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 29 Apr 2013 10:44:18 +0100 |
| parents | f833d2188c16 |
| children | 40e7a6cf15ff |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 29 Apr 2013 10:44:18 +0100 |
| parents | f833d2188c16 |
| children | 40e7a6cf15ff |