Diff

util/jid.lua @ 6020:69d12c3fe991

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 19 Feb 2014 20:10:23 +0100
parent 5945:51ead0aa3a02
child 6338:736c388748fd
line wrap: on
line diff