Diff

plugins/muc/occupant.lib.lua @ 6423:1c78f10f05d0

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 23 Sep 2014 01:44:16 +0200
parent 6271:006b0e0f0de2
child 7086:6cc7c9da29ed
line wrap: on
line diff