comparison util/jid.lua @ 7516:f74ff35a4b03

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 23 Jul 2016 18:58:58 +0200
parents a7199fc8a50e
children 2be85cb3bc66
comparison
equal deleted inserted replaced
7510:8a0a50e8ef2d 7516:f74ff35a4b03