Diff

util/jid.lua @ 7042:20ac6972b9aa

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Sat, 02 Jan 2016 20:42:53 +0000
parent 6891:7f76c77ddcb8
child 7296:1859e07ae082
line wrap: on
line diff