comparison plugins/muc/occupant.lib.lua @ 8112:d8ecefcb7c97

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 21 Apr 2017 15:22:17 +0200
parents 6cc7c9da29ed
children 74b9e05af71e
comparison
equal deleted inserted replaced
8103:a0b498ec0b22 8112:d8ecefcb7c97