Mercurial > prosody-hg
diff plugins/mod_s2s/s2sout.lib.lua @ 5858:89b16a160cbc
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 06 Oct 2013 23:53:15 +0200 |
| parents | 4a7e90b4c97d |
| children | e327f2d4e09f |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 06 Oct 2013 23:53:15 +0200 |
| parents | 4a7e90b4c97d |
| children | e327f2d4e09f |