comparison plugins/muc/occupant.lib.lua @ 7798:74cfec1fe5a2

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 01 Jan 2017 19:35:06 +0100
parents 6cc7c9da29ed
children 74b9e05af71e
comparison
equal deleted inserted replaced
7797:d0c32d86724f 7798:74cfec1fe5a2