Comparison

plugins/muc/occupant.lib.lua @ 7102:250016f5eb7e

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 26 Jan 2016 14:15:38 +0100
parent 7086:6cc7c9da29ed
child 12977:74b9e05af71e
comparison
equal deleted inserted replaced
7099:8e64e7b82928 7102:250016f5eb7e