Mercurial > prosody-hg
diff plugins/mod_s2s/s2sout.lib.lua @ 6988:329d5fb8a9d3
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 10 Dec 2015 18:58:30 +0000 |
| parents | 65344c3bae7a |
| children | 5286e79c6829 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 10 Dec 2015 18:58:30 +0000 |
| parents | 65344c3bae7a |
| children | 5286e79c6829 |