Comparison

plugins/muc/occupant.lib.lua @ 7822:4caaa0c185f1

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 13 Jan 2017 18:30:18 +0100
parent 7086:6cc7c9da29ed
child 12977:74b9e05af71e
comparison
equal deleted inserted replaced
7820:8a9942086068 7822:4caaa0c185f1