Mercurial > prosody-hg
diff plugins/mod_s2s/s2sout.lib.lua @ 7107:e7d199c2a22d
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 27 Jan 2016 20:38:09 +0000 |
| parents | 5286e79c6829 |
| children | ab8324d3b899 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 27 Jan 2016 20:38:09 +0000 |
| parents | 5286e79c6829 |
| children | ab8324d3b899 |