comparison plugins/muc/occupant.lib.lua @ 7467:9a73c85baffe

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 08 Jul 2016 15:12:44 +0200
parents 6cc7c9da29ed
children 74b9e05af71e
comparison
equal deleted inserted replaced
7465:f1923f00b7de 7467:9a73c85baffe