Comparison

plugins/muc/occupant.lib.lua @ 7232:db0dc08929e7

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 03 Mar 2016 16:06:16 +0100
parent 7086:6cc7c9da29ed
child 12977:74b9e05af71e
comparison
equal deleted inserted replaced
7225:a74f0b7be6bf 7232:db0dc08929e7