Diff

plugins/muc/occupant.lib.lua @ 6525:7c273da3cff6

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 20 Nov 2014 15:01:47 +0100
parent 6271:006b0e0f0de2
child 7086:6cc7c9da29ed
line wrap: on
line diff