Mercurial > prosody-hg
diff plugins/mod_s2s/s2sout.lib.lua @ 6354:bbb4a82db32e
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 13 Aug 2014 19:22:08 +0200 |
| parents | d05627c89c99 |
| children | 855085439f7f |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 13 Aug 2014 19:22:08 +0200 |
| parents | d05627c89c99 |
| children | 855085439f7f |