comparison plugins/muc/occupant.lib.lua @ 7348:a8ca12e7c2fb

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 08 Apr 2016 17:54:50 +0200
parents 6cc7c9da29ed
children 74b9e05af71e
comparison
equal deleted inserted replaced
7347:795a95258292 7348:a8ca12e7c2fb