Mercurial > prosody-hg
comparison plugins/mod_s2s/mod_s2s.lua @ 6516:ecd8d6437053
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 20 Nov 2014 09:02:23 +0000 |
| parents | 7c8f58d2b331 |
| children | 61b6a4fc65f1 64e6b88b6b21 |
comparison
equal
deleted
inserted
replaced
| 6514:d425fc41e59f | 6516:ecd8d6437053 |
|---|