Mercurial > prosody-hg
diff plugins/mod_s2s/s2sout.lib.lua @ 5751:3dd3bb40df56
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 15 Jul 2013 23:35:49 +0100 |
| parents | ea00fc524b95 |
| children | bd0ff8ae98a8 8fead005ee60 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 15 Jul 2013 23:35:49 +0100 |
| parents | ea00fc524b95 |
| children | bd0ff8ae98a8 8fead005ee60 |