Comparison

util/jid.lua @ 6729:daa5c83b2879

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 21 May 2015 22:56:39 +0200 (2015-05-21)
parent 6340:7e820979fd9b
child 6777:5de6b93d0190
comparison
equal deleted inserted replaced
6727:eb9c842b80fa 6729:daa5c83b2879