comparison plugins/muc/occupant.lib.lua @ 7808:0494bf73dfee

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 04 Jan 2017 10:53:16 +0100
parents 6cc7c9da29ed
children 74b9e05af71e
comparison
equal deleted inserted replaced
7803:4d182b9a8109 7808:0494bf73dfee