Mercurial > prosody-hg
diff util/jid.lua @ 5201:99cb5170a2ea
Merge 0.9->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 23 Nov 2012 17:17:02 +0100 |
| parents | f78c6f5fa090 |
| children | bd0ff8ae98a8 f3817912e8b2 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 23 Nov 2012 17:17:02 +0100 |
| parents | f78c6f5fa090 |
| children | bd0ff8ae98a8 f3817912e8b2 |