Mercurial > prosody-hg
diff plugins/mod_s2s/s2sout.lib.lua @ 5346:b8fbb9d07efc
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 12 Mar 2013 12:30:35 +0000 |
| parents | 8b94a8d92cf3 |
| children | 901ed253bbf7 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 12 Mar 2013 12:30:35 +0000 |
| parents | 8b94a8d92cf3 |
| children | 901ed253bbf7 |