Diff

util/jid.lua @ 6032:c0ee152400ff

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 09 Mar 2014 23:48:32 +0100
parent 5945:51ead0aa3a02
child 6338:736c388748fd
line wrap: on
line diff