Mercurial > prosody-hg
diff util/jid.lua @ 5088:d5bb9cd2e6df
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 10 Aug 2012 16:32:40 +0100 |
| parents | f78c6f5fa090 |
| children | bd0ff8ae98a8 f3817912e8b2 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 10 Aug 2012 16:32:40 +0100 |
| parents | f78c6f5fa090 |
| children | bd0ff8ae98a8 f3817912e8b2 |