comparison plugins/muc/occupant.lib.lua @ 7219:c12c9b9c1949

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 28 Feb 2016 19:27:13 +0100
parents 6cc7c9da29ed
children 74b9e05af71e
comparison
equal deleted inserted replaced
7214:a927edfb54ab 7219:c12c9b9c1949