Mercurial > prosody-hg
diff plugins/mod_s2s/s2sout.lib.lua @ 6285:ea60d0441df7
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 21 Jun 2014 15:05:52 +0200 |
| parents | d05627c89c99 |
| children | 855085439f7f |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 21 Jun 2014 15:05:52 +0200 |
| parents | d05627c89c99 |
| children | 855085439f7f |