Diff

plugins/muc/occupant.lib.lua @ 7562:bc40f6d626a0

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 12 Aug 2016 01:38:47 +0200
parent 7086:6cc7c9da29ed
child 12977:74b9e05af71e
line wrap: on
line diff