Diff

util/jid.lua @ 6560:6f39c58bdcc4

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 26 Jan 2015 15:27:19 +0100
parent 6340:7e820979fd9b
child 6777:5de6b93d0190
line wrap: on
line diff