Diff

plugins/muc/occupant.lib.lua @ 7042:20ac6972b9aa

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Sat, 02 Jan 2016 20:42:53 +0000
parent 6271:006b0e0f0de2
child 7086:6cc7c9da29ed
line wrap: on
line diff