comparison plugins/muc/occupant.lib.lua @ 7735:1502ec4f3cbe

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 21 Nov 2016 02:40:47 +0100
parents 6cc7c9da29ed
children 74b9e05af71e
comparison
equal deleted inserted replaced
7727:0011889c928f 7735:1502ec4f3cbe