Diff

plugins/muc/occupant.lib.lua @ 6791:e813e8cf6046

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 20 Aug 2015 13:05:22 +0200
parent 6271:006b0e0f0de2
child 7086:6cc7c9da29ed
line wrap: on
line diff