Comparison

plugins/muc/occupant.lib.lua @ 7786:b62353e6a8e5

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 14 Dec 2016 01:47:19 +0100
parent 7086:6cc7c9da29ed
child 12977:74b9e05af71e
comparison
equal deleted inserted replaced
7780:dbd202e7c587 7786:b62353e6a8e5