Comparison

plugins/muc/occupant.lib.lua @ 7532:02b3ea42265b

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 29 Jul 2016 12:34:16 +0200
parent 7086:6cc7c9da29ed
child 12977:74b9e05af71e
comparison
equal deleted inserted replaced
7530:f14094d10925 7532:02b3ea42265b