Mercurial > prosody-hg
diff plugins/mod_s2s/s2sout.lib.lua @ 5160:da7fe5de82fb
Merge 0.9 -> trunk (like this?)
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 29 Sep 2012 01:05:17 +0200 |
| parents | 8b94a8d92cf3 |
| children | 901ed253bbf7 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 29 Sep 2012 01:05:17 +0200 |
| parents | 8b94a8d92cf3 |
| children | 901ed253bbf7 |