Mercurial > prosody-hg
diff util/jid.lua @ 2985:fde53d82fde0
Merge 0.7->trunk (with MUC needing checking, waqas)
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 04 May 2010 23:36:50 +0100 |
| parents | b7049746bd29 |
| children | 29e51e1c7c3d |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 04 May 2010 23:36:50 +0100 |
| parents | b7049746bd29 |
| children | 29e51e1c7c3d |