Diff

plugins/muc/occupant.lib.lua @ 6888:39c5c49616ab

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 27 Sep 2015 00:37:18 +0200
parent 6271:006b0e0f0de2
child 7086:6cc7c9da29ed
line wrap: on
line diff