Diff

plugins/muc/occupant.lib.lua @ 7063:bc1b375f379e

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 08 Jan 2016 16:21:05 +0100
parent 6271:006b0e0f0de2
child 7086:6cc7c9da29ed
line wrap: on
line diff