comparison plugins/muc/occupant.lib.lua @ 7967:95e16696ef8a

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 07 Mar 2017 22:44:12 +0100
parents 6cc7c9da29ed
children 74b9e05af71e
comparison
equal deleted inserted replaced
7963:4f9535b7fdf7 7967:95e16696ef8a