Mercurial > prosody-hg
diff plugins/mod_s2s/s2sout.lib.lua @ 5574:40fe8bd35eaa
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 11 May 2013 13:55:14 +0100 |
| parents | 40e7a6cf15ff |
| children | 94081567ea9e |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 11 May 2013 13:55:14 +0100 |
| parents | 40e7a6cf15ff |
| children | 94081567ea9e |