Diff

plugins/muc/occupant.lib.lua @ 6322:c3d750a43d8c

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 25 Jul 2014 21:16:52 +0200
parent 6271:006b0e0f0de2
child 7086:6cc7c9da29ed
line wrap: on
line diff