comparison plugins/muc/occupant.lib.lua @ 6623:0da3e10b3333

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 05 Apr 2015 15:22:33 +0200
parents 006b0e0f0de2
children 6cc7c9da29ed
comparison
equal deleted inserted replaced
6621:352fa2cae1c9 6623:0da3e10b3333