Mercurial > prosody-hg
diff tools/openfire2prosody.lua @ 5469:fcdcc37ffec1
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 12 Apr 2013 00:45:46 +0100 |
| parents | f2becd36d1d0 |
| children | 9fba74a28e0c |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 12 Apr 2013 00:45:46 +0100 |
| parents | f2becd36d1d0 |
| children | 9fba74a28e0c |