Diff

util/jid.lua @ 5160:da7fe5de82fb

Merge 0.9 -> trunk (like this?)
author Kim Alvefur <zash@zash.se>
date Sat, 29 Sep 2012 01:05:17 +0200
parent 4407:f78c6f5fa090
child 5776:bd0ff8ae98a8
child 5944:f3817912e8b2
line wrap: on
line diff