Diff

util/jid.lua @ 6354:bbb4a82db32e

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 13 Aug 2014 19:22:08 +0200
parent 6340:7e820979fd9b
child 6777:5de6b93d0190
line wrap: on
line diff