Comparison

plugins/muc/occupant.lib.lua @ 7686:8d6f367bed8c

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 07 Oct 2016 16:52:18 +0200
parent 7086:6cc7c9da29ed
child 12977:74b9e05af71e
comparison
equal deleted inserted replaced
7669:b332db1baf0b 7686:8d6f367bed8c