Mercurial > prosody-modules
diff mod_s2s_reload_newcomponent/mod_s2s_reload_newcomponent.lua @ 416:10ff12fa82e2
merge.
| author | Marco Cirillo <maranda@lightwitch.org> |
|---|---|
| date | Fri, 02 Sep 2011 23:36:22 +0000 |
| parents | 7487f8b47662 |
| children | fe5bb7b13a59 |
| author | Marco Cirillo <maranda@lightwitch.org> |
|---|---|
| date | Fri, 02 Sep 2011 23:36:22 +0000 |
| parents | 7487f8b47662 |
| children | fe5bb7b13a59 |