Mercurial > prosody-hg
diff util/jid.lua @ 7505:3d950ee0de35
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 14 Jul 2016 13:41:02 +0200 |
| parents | a7199fc8a50e |
| children | 2be85cb3bc66 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 14 Jul 2016 13:41:02 +0200 |
| parents | a7199fc8a50e |
| children | 2be85cb3bc66 |