Diff

plugins/muc/occupant.lib.lua @ 6560:6f39c58bdcc4

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 26 Jan 2015 15:27:19 +0100
parent 6271:006b0e0f0de2
child 7086:6cc7c9da29ed
line wrap: on
line diff