Mercurial > prosody-hg
diff plugins/mod_s2s/s2sout.lib.lua @ 6027:8c69cea8a1bf
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 26 Feb 2014 22:21:55 +0100 |
| parents | ac0879a8190a |
| children | d05627c89c99 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 26 Feb 2014 22:21:55 +0100 |
| parents | ac0879a8190a |
| children | d05627c89c99 |