Mercurial > prosody-hg
comparison plugins/mod_s2s/s2sout.lib.lua @ 5431:19d537b5aacc
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 05 Apr 2013 10:05:18 +0100 |
| parents | f833d2188c16 |
| children | 40e7a6cf15ff |
comparison
equal
deleted
inserted
replaced
| 5420:706053e3f9f5 | 5431:19d537b5aacc |
|---|
