Mercurial > prosody-hg
diff plugins/mod_s2s/s2sout.lib.lua @ 6908:047becf393ca
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 17 Oct 2015 19:31:43 +0200 |
| parents | 3f05b255937f |
| children | 65344c3bae7a |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 17 Oct 2015 19:31:43 +0200 |
| parents | 3f05b255937f |
| children | 65344c3bae7a |