comparison plugins/muc/occupant.lib.lua @ 6775:22c8deb43daf

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 11 Aug 2015 10:29:25 +0200
parents 006b0e0f0de2
children 6cc7c9da29ed
comparison
equal deleted inserted replaced
6770:cb84731b2dfd 6775:22c8deb43daf