Mercurial > prosody-hg
diff plugins/mod_s2s/s2sout.lib.lua @ 5246:eba55873ef29
Merge 0.9->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 15 Dec 2012 05:35:43 +0100 |
| parents | 8b94a8d92cf3 |
| children | 901ed253bbf7 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 15 Dec 2012 05:35:43 +0100 |
| parents | 8b94a8d92cf3 |
| children | 901ed253bbf7 |