Mercurial > prosody-hg
diff plugins/mod_s2s/s2sout.lib.lua @ 5674:ebdbf4cf0b2f
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 11 Jun 2013 21:50:41 +0100 |
| parents | 40e7a6cf15ff |
| children | 94081567ea9e |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 11 Jun 2013 21:50:41 +0100 |
| parents | 40e7a6cf15ff |
| children | 94081567ea9e |