Mercurial > prosody-hg
diff plugins/mod_s2s/mod_s2s.lua @ 6081:19ada596aec4
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 15 Apr 2014 20:36:39 +0200 |
| parents | 446148cad35e |
| children | 2f911644f527 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 15 Apr 2014 20:36:39 +0200 |
| parents | 446148cad35e |
| children | 2f911644f527 |