Mercurial > prosody-hg
diff plugins/mod_s2s/s2sout.lib.lua @ 6727:eb9c842b80fa
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 19 May 2015 23:23:44 +0200 |
| parents | 3f05b255937f |
| children | 65344c3bae7a |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 19 May 2015 23:23:44 +0200 |
| parents | 3f05b255937f |
| children | 65344c3bae7a |