comparison plugins/muc/occupant.lib.lua @ 7195:39b7ea9141c0

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 25 Feb 2016 15:40:35 +0100
parents 6cc7c9da29ed
children 74b9e05af71e
comparison
equal deleted inserted replaced
7191:df4f52cabdfe 7195:39b7ea9141c0