Comparison

plugins/muc/occupant.lib.lua @ 7494:f82356adcd71

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 13 Jul 2016 10:25:52 +0200
parent 7086:6cc7c9da29ed
child 12977:74b9e05af71e
comparison
equal deleted inserted replaced
7488:cdabf8199903 7494:f82356adcd71