Mercurial > prosody-hg
diff plugins/mod_s2s/s2sout.lib.lua @ 5199:e6fedce399eb
Merge 0.9->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 23 Nov 2012 01:51:53 +0100 |
| parents | 8b94a8d92cf3 |
| children | 901ed253bbf7 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 23 Nov 2012 01:51:53 +0100 |
| parents | 8b94a8d92cf3 |
| children | 901ed253bbf7 |