Mercurial > prosody-hg
comparison plugins/mod_s2s/mod_s2s.lua @ 6456:a8d9d3eea6f4
Merge 0.10->trunk
| author | daurnimator <quae@daurnimator.com> |
|---|---|
| date | Mon, 29 Sep 2014 13:59:16 -0400 |
| parents | e5945fb5b71f |
| children | 7c8f58d2b331 |
comparison
equal
deleted
inserted
replaced
| 6454:6842b07fc7bc | 6456:a8d9d3eea6f4 |
|---|