Diff

util/jid.lua @ 5476:dc9485ac266b

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Mon, 15 Apr 2013 21:22:45 +0100
parent 4407:f78c6f5fa090
child 5776:bd0ff8ae98a8
child 5944:f3817912e8b2
line wrap: on
line diff