Mercurial > prosody-hg
diff plugins/mod_s2s/s2sout.lib.lua @ 7085:343be83ddfa6
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 16 Jan 2016 22:44:43 +0100 |
| parents | 65344c3bae7a |
| children | 5286e79c6829 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 16 Jan 2016 22:44:43 +0100 |
| parents | 65344c3bae7a |
| children | 5286e79c6829 |