Diff

plugins/muc/occupant.lib.lua @ 7516:f74ff35a4b03

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 23 Jul 2016 18:58:58 +0200
parent 7086:6cc7c9da29ed
child 12977:74b9e05af71e
line wrap: on
line diff