Diff

util/jid.lua @ 5666:c1e1b265ee82

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 10 Jun 2013 14:37:02 +0200
parent 4407:f78c6f5fa090
child 5776:bd0ff8ae98a8
child 5944:f3817912e8b2
line wrap: on
line diff