Diff

plugins/muc/occupant.lib.lua @ 7456:76a8456cf1e2

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 12 Jun 2016 20:06:30 +0200
parent 7086:6cc7c9da29ed
child 12977:74b9e05af71e
line wrap: on
line diff