comparison plugins/muc/occupant.lib.lua @ 7549:d5f8a56eda4c

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 10 Aug 2016 17:00:10 +0200
parents 6cc7c9da29ed
children 74b9e05af71e
comparison
equal deleted inserted replaced
7547:b327322ce2dd 7549:d5f8a56eda4c