Mercurial > prosody-hg
diff tools/openfire2prosody.lua @ 5495:d5b07342fccf
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 18 Apr 2013 11:14:16 +0100 |
| parents | f2becd36d1d0 |
| children | 9fba74a28e0c |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 18 Apr 2013 11:14:16 +0100 |
| parents | f2becd36d1d0 |
| children | 9fba74a28e0c |