comparison plugins/muc/occupant.lib.lua @ 7874:de3c6fb74759

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 28 Jan 2017 21:39:14 +0100
parents 6cc7c9da29ed
children 74b9e05af71e
comparison
equal deleted inserted replaced
7870:a858066faac6 7874:de3c6fb74759