Diff

plugins/muc/occupant.lib.lua @ 7099:8e64e7b82928

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 22 Jan 2016 15:03:02 +0100
parent 7086:6cc7c9da29ed
child 12977:74b9e05af71e
line wrap: on
line diff